aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/irb/irb.rd.ja4
-rw-r--r--lib/irb.rb9
-rw-r--r--lib/irb/context.rb3
-rw-r--r--lib/irb/init.rb6
-rw-r--r--test/irb/test_cmd.rb18
-rw-r--r--test/irb/test_context.rb1
-rw-r--r--test/irb/yamatanooroti/test_rendering.rb2
7 files changed, 7 insertions, 36 deletions
diff --git a/doc/irb/irb.rd.ja b/doc/irb/irb.rd.ja
index 633c08cbd4..c51e0bd60d 100644
--- a/doc/irb/irb.rd.ja
+++ b/doc/irb/irb.rd.ja
@@ -125,7 +125,6 @@ irb起動時に``~/.irbrc''を読み込みます. もし存在しない場合は
IRB.conf[:PROMPT][:MY_PROMPT] = { # プロンプトモードの名前
:PROMPT_I => nil, # 通常のプロンプト
- :PROMPT_N => nil, # 継続行のプロンプト
:PROMPT_S => nil, # 文字列などの継続行のプロンプト
:PROMPT_C => nil, # 式が継続している時のプロンプト
:RETURN => " ==>%s\n" # リターン時のプロンプト
@@ -140,7 +139,7 @@ OKです.
IRB.conf[:PROMPT_MODE] = :MY_PROMPT
-PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_Cは, フォーマットを指定します.
+PROMPT_I, PROMPT_S, PROMPT_Cは, フォーマットを指定します.
%N 起動しているコマンド名が出力される.
%m mainオブジェクト(self)がto_sで出力される.
@@ -155,7 +154,6 @@ PROMPT_I, PROMPT_N, PROMPT_S, PROMPT_Cは, フォーマットを指定します.
IRB.conf[:PROMPT][:DEFAULT] = {
:PROMPT_I => "%N(%m):%03n:%i> ",
- :PROMPT_N => "%N(%m):%03n:%i> ",
:PROMPT_S => "%N(%m):%03n:%i%l ",
:PROMPT_C => "%N(%m):%03n:%i* ",
:RETURN => "=> %s\n"
diff --git a/lib/irb.rb b/lib/irb.rb
index aa41258305..db0aed055e 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -197,7 +197,6 @@ require_relative "irb/debug"
#
# IRB.conf[:PROMPT_MODE][:DEFAULT] = {
# :PROMPT_I => "%N(%m):%03n> ",
-# :PROMPT_N => "%N(%m):%03n> ",
# :PROMPT_S => "%N(%m):%03n%l ",
# :PROMPT_C => "%N(%m):%03n* ",
# :RETURN => "%s\n" # used to printf
@@ -207,35 +206,30 @@ require_relative "irb/debug"
#
# # :NULL:
# # :PROMPT_I:
-# # :PROMPT_N:
# # :PROMPT_S:
# # :PROMPT_C:
# # :RETURN: |
# # %s
# # :DEFAULT:
# # :PROMPT_I: ! '%N(%m):%03n> '
-# # :PROMPT_N: ! '%N(%m):%03n> '
# # :PROMPT_S: ! '%N(%m):%03n%l '
# # :PROMPT_C: ! '%N(%m):%03n* '
# # :RETURN: |
# # => %s
# # :CLASSIC:
# # :PROMPT_I: ! '%N(%m):%03n:%i> '
-# # :PROMPT_N: ! '%N(%m):%03n:%i> '
# # :PROMPT_S: ! '%N(%m):%03n:%i%l '
# # :PROMPT_C: ! '%N(%m):%03n:%i* '
# # :RETURN: |
# # %s
# # :SIMPLE:
# # :PROMPT_I: ! '>> '
-# # :PROMPT_N: ! '>> '
# # :PROMPT_S:
# # :PROMPT_C: ! '?> '
# # :RETURN: |
# # => %s
# # :INF_RUBY:
# # :PROMPT_I: ! '%N(%m):%03n> '
-# # :PROMPT_N:
# # :PROMPT_S:
# # :PROMPT_C:
# # :RETURN: |
@@ -243,7 +237,6 @@ require_relative "irb/debug"
# # :AUTO_INDENT: true
# # :XMP:
# # :PROMPT_I:
-# # :PROMPT_N:
# # :PROMPT_S:
# # :PROMPT_C:
# # :RETURN: |2
@@ -528,8 +521,6 @@ module IRB
f = @context.prompt_s
elsif continue
f = @context.prompt_c
- elsif indent > 0
- f = @context.prompt_n
else
f = @context.prompt_i
end
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index 43d9b53435..6d6261e60b 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -229,8 +229,6 @@ module IRB
#
# See IRB@Customizing+the+IRB+Prompt for more information.
attr_accessor :prompt_c
- # See IRB@Customizing+the+IRB+Prompt for more information.
- attr_accessor :prompt_n
# Can be either the default <code>IRB.conf[:AUTO_INDENT]</code>, or the
# mode set by #prompt_mode=
#
@@ -414,7 +412,6 @@ module IRB
@prompt_i = pconf[:PROMPT_I]
@prompt_s = pconf[:PROMPT_S]
@prompt_c = pconf[:PROMPT_C]
- @prompt_n = pconf[:PROMPT_N]
@return_format = pconf[:RETURN]
@return_format = "%s\n" if @return_format == nil
if ai = pconf.include?(:AUTO_INDENT)
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index ef07a5f1e6..d1097b5738 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -58,35 +58,30 @@ module IRB # :nodoc:
@CONF[:PROMPT] = {
:NULL => {
:PROMPT_I => nil,
- :PROMPT_N => nil,
:PROMPT_S => nil,
:PROMPT_C => nil,
:RETURN => "%s\n"
},
:DEFAULT => {
:PROMPT_I => "%N(%m):%03n> ",
- :PROMPT_N => "%N(%m):%03n> ",
:PROMPT_S => "%N(%m):%03n%l ",
:PROMPT_C => "%N(%m):%03n* ",
:RETURN => "=> %s\n"
},
:CLASSIC => {
:PROMPT_I => "%N(%m):%03n:%i> ",
- :PROMPT_N => "%N(%m):%03n:%i> ",
:PROMPT_S => "%N(%m):%03n:%i%l ",
:PROMPT_C => "%N(%m):%03n:%i* ",
:RETURN => "%s\n"
},
:SIMPLE => {
:PROMPT_I => ">> ",
- :PROMPT_N => ">> ",
:PROMPT_S => "%l> ",
:PROMPT_C => "?> ",
:RETURN => "=> %s\n"
},
:INF_RUBY => {
:PROMPT_I => "%N(%m):%03n> ",
- :PROMPT_N => nil,
:PROMPT_S => nil,
:PROMPT_C => nil,
:RETURN => "%s\n",
@@ -94,7 +89,6 @@ module IRB # :nodoc:
},
:XMP => {
:PROMPT_I => nil,
- :PROMPT_N => nil,
:PROMPT_S => nil,
:PROMPT_C => nil,
:RETURN => " ==>%s\n"
diff --git a/test/irb/test_cmd.rb b/test/irb/test_cmd.rb
index 670078679f..e8c959ec39 100644
--- a/test/irb/test_cmd.rb
+++ b/test/irb/test_cmd.rb
@@ -211,8 +211,7 @@ module TestIRB
DEFAULT: {
PROMPT_I: '> ',
PROMPT_S: '> ',
- PROMPT_C: '> ',
- PROMPT_N: '> '
+ PROMPT_C: '> '
}
},
PROMPT_MODE: :DEFAULT,
@@ -241,8 +240,7 @@ module TestIRB
DEFAULT: {
PROMPT_I: '> ',
PROMPT_S: '> ',
- PROMPT_C: '> ',
- PROMPT_N: '> '
+ PROMPT_C: '> '
}
},
PROMPT_MODE: :DEFAULT,
@@ -269,8 +267,7 @@ module TestIRB
DEFAULT: {
PROMPT_I: '> ',
PROMPT_S: '> ',
- PROMPT_C: '> ',
- PROMPT_N: '> '
+ PROMPT_C: '> '
}
},
PROMPT_MODE: :DEFAULT,
@@ -300,8 +297,7 @@ module TestIRB
DEFAULT: {
PROMPT_I: '> ',
PROMPT_S: '> ',
- PROMPT_C: '> ',
- PROMPT_N: '> '
+ PROMPT_C: '> '
}
},
PROMPT_MODE: :DEFAULT,
@@ -331,8 +327,7 @@ module TestIRB
DEFAULT: {
PROMPT_I: '> ',
PROMPT_S: '> ',
- PROMPT_C: '> ',
- PROMPT_N: '> '
+ PROMPT_C: '> '
}
},
PROMPT_MODE: :DEFAULT,
@@ -358,8 +353,7 @@ module TestIRB
DEFAULT: {
PROMPT_I: '> ',
PROMPT_S: '> ',
- PROMPT_C: '> ',
- PROMPT_N: '> '
+ PROMPT_C: '> '
}
},
PROMPT_MODE: :DEFAULT,
diff --git a/test/irb/test_context.rb b/test/irb/test_context.rb
index 5847df172e..29c67392f3 100644
--- a/test/irb/test_context.rb
+++ b/test/irb/test_context.rb
@@ -454,7 +454,6 @@ module TestIRB
def test_default_return_format
IRB.conf[:PROMPT][:MY_PROMPT] = {
:PROMPT_I => "%03n> ",
- :PROMPT_N => "%03n> ",
:PROMPT_S => "%03n> ",
:PROMPT_C => "%03n> "
# without :RETURN
diff --git a/test/irb/yamatanooroti/test_rendering.rb b/test/irb/yamatanooroti/test_rendering.rb
index 3da3935c19..80833d0522 100644
--- a/test/irb/yamatanooroti/test_rendering.rb
+++ b/test/irb/yamatanooroti/test_rendering.rb
@@ -179,7 +179,6 @@ class IRB::RenderingTest < Yamatanooroti::TestCase
write_irbrc <<~'LINES'
IRB.conf[:PROMPT][:MY_PROMPT] = {
:PROMPT_I => "%03n> ",
- :PROMPT_N => "%03n> ",
:PROMPT_S => "%03n> ",
:PROMPT_C => "%03n> "
}
@@ -214,7 +213,6 @@ class IRB::RenderingTest < Yamatanooroti::TestCase
write_irbrc <<~'LINES'
IRB.conf[:PROMPT][:MY_PROMPT] = {
:PROMPT_I => "%03n> ",
- :PROMPT_N => "%03n> ",
:PROMPT_S => "%03n> ",
:PROMPT_C => "%03n> "
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-01 08:42:57 +0000