aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-10-30 17:03:30 +0000
committerJuanma Barranquero2008-10-30 17:03:30 +0000
commit1d2b0303d9d5ebe93c12f12257c852bcf2b1a416 (patch)
tree996bf477840a9d38ec8ed7c27b687aa26097c400
parent8b72835cb3ac00f42db998d4e6a192ae1fd50738 (diff)
downloademacs-1d2b0303d9d5ebe93c12f12257c852bcf2b1a416.tar.gz
emacs-1d2b0303d9d5ebe93c12f12257c852bcf2b1a416.zip
* simple.el (idle-update-delay, next-error-highlight)
(next-error-highlight-no-select, next-error-recenter, next-error-hook) (minibuffer-history-case-insensitive-variables, kill-ring-max) (kill-read-only-ok, backward-delete-char-untabify-method) (kill-whole-line, mark-ring-max, global-mark-ring-max) (set-mark-command-repeat-pop, next-line-add-newlines, track-eol) (goal-column, line-move-ignore-invisible, fill-prefix) (auto-fill-inhibit-regexp, blink-matching-paren) (blink-matching-paren-on-screen, blink-matching-paren-distance) (blink-matching-delay, blink-matching-paren-dont-ignore-comments) (read-mail-command, mail-user-agent): Remove * in defcustom docstrings. (minibuffer-history-isearch-wrap, transient-mark-mode) (next-logical-line, auto-fill-mode, line-number-mode) (column-number-mode, size-indication-mode, clone-indirect-buffer) (normal-erase-is-backspace-mode): Doc fixes. (current-kill, transient-mark-mode, toggle-truncate-lines) (visible-mode): Reflow docstrings. (minibuffer-local-shell-command-map, interprogram-paste-function): Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog25
-rw-r--r--lisp/simple.el102
2 files changed, 74 insertions, 53 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1608ce0a893..bdb80566459 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
12008-10-30 Juanma Barranquero <lekktu@gmail.com>
2
3 * simple.el (idle-update-delay, next-error-highlight)
4 (next-error-highlight-no-select, next-error-recenter, next-error-hook)
5 (minibuffer-history-case-insensitive-variables, kill-ring-max)
6 (kill-read-only-ok, backward-delete-char-untabify-method)
7 (kill-whole-line, mark-ring-max, global-mark-ring-max)
8 (set-mark-command-repeat-pop, next-line-add-newlines, track-eol)
9 (goal-column, line-move-ignore-invisible, fill-prefix)
10 (auto-fill-inhibit-regexp, blink-matching-paren)
11 (blink-matching-paren-on-screen, blink-matching-paren-distance)
12 (blink-matching-delay, blink-matching-paren-dont-ignore-comments)
13 (read-mail-command, mail-user-agent): Remove * in defcustom docstrings.
14 (minibuffer-history-isearch-wrap, transient-mark-mode)
15 (next-logical-line, auto-fill-mode, line-number-mode)
16 (column-number-mode, size-indication-mode, clone-indirect-buffer)
17 (normal-erase-is-backspace-mode): Doc fixes.
18 (current-kill, transient-mark-mode, toggle-truncate-lines)
19 (visible-mode): Reflow docstrings.
20 (minibuffer-local-shell-command-map, interprogram-paste-function):
21 Fix typos in docstrings.
22
12008-10-30 Chong Yidong <cyd@stupidchicken.com> 232008-10-30 Chong Yidong <cyd@stupidchicken.com>
2 24
3 * server.el (server-process-filter): In daemon mode, default to 25 * server.el (server-process-filter): In daemon mode, default to
@@ -29,8 +51,7 @@
29 * minibuffer.el (delete-minibuffer-contents): Delete all 51 * minibuffer.el (delete-minibuffer-contents): Delete all
30 minibuffer contents instead of just the current field. 52 minibuffer contents instead of just the current field.
31 53
32 * tmm.el (tmm-get-keymap): Handle case where keyseq cache is 54 * tmm.el (tmm-get-keymap): Handle case where keyseq cache is omitted.
33 omitted.
34 55
35 * bookmark.el (bookmark-handle-bookmark): Rename from 56 * bookmark.el (bookmark-handle-bookmark): Rename from
36 bookmark-jump-noselect. 57 bookmark-jump-noselect.
diff --git a/lisp/simple.el b/lisp/simple.el
index 6ebbd71cdbf..2c356d40e60 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -38,7 +38,7 @@
38(defvar compilation-current-error) 38(defvar compilation-current-error)
39 39
40(defcustom idle-update-delay 0.5 40(defcustom idle-update-delay 0.5
41 "*Idle time delay before updating various things on the screen. 41 "Idle time delay before updating various things on the screen.
42Various Emacs features that update auxiliary information when point moves 42Various Emacs features that update auxiliary information when point moves
43wait this many seconds after Emacs becomes idle before doing an update." 43wait this many seconds after Emacs becomes idle before doing an update."
44 :type 'number 44 :type 'number
@@ -118,7 +118,7 @@ If no other buffer exists, the buffer `*scratch*' is returned."
118 :version "22.1") 118 :version "22.1")
119 119
120(defcustom next-error-highlight 0.5 120(defcustom next-error-highlight 0.5
121 "*Highlighting of locations in selected source buffers. 121 "Highlighting of locations in selected source buffers.
122If a number, highlight the locus in `next-error' face for the given time 122If a number, highlight the locus in `next-error' face for the given time
123in seconds, or until the next command is executed. 123in seconds, or until the next command is executed.
124If t, highlight the locus until the next command is executed, or until 124If t, highlight the locus until the next command is executed, or until
@@ -133,7 +133,7 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
133 :version "22.1") 133 :version "22.1")
134 134
135(defcustom next-error-highlight-no-select 0.5 135(defcustom next-error-highlight-no-select 0.5
136 "*Highlighting of locations in `next-error-no-select'. 136 "Highlighting of locations in `next-error-no-select'.
137If number, highlight the locus in `next-error' face for given time in seconds. 137If number, highlight the locus in `next-error' face for given time in seconds.
138If t, highlight the locus indefinitely until some other locus replaces it. 138If t, highlight the locus indefinitely until some other locus replaces it.
139If nil, don't highlight the locus in the source buffer. 139If nil, don't highlight the locus in the source buffer.
@@ -146,7 +146,7 @@ If `fringe-arrow', indicate the locus by the fringe arrow."
146 :version "22.1") 146 :version "22.1")
147 147
148(defcustom next-error-recenter nil 148(defcustom next-error-recenter nil
149 "*Display the line in the visited source file recentered as specified. 149 "Display the line in the visited source file recentered as specified.
150If non-nil, the value is passed directly to `recenter'." 150If non-nil, the value is passed directly to `recenter'."
151 :type '(choice (integer :tag "Line to recenter to") 151 :type '(choice (integer :tag "Line to recenter to")
152 (const :tag "Center of window" (4)) 152 (const :tag "Center of window" (4))
@@ -155,7 +155,7 @@ If non-nil, the value is passed directly to `recenter'."
155 :version "23.1") 155 :version "23.1")
156 156
157(defcustom next-error-hook nil 157(defcustom next-error-hook nil
158 "*List of hook functions run by `next-error' after visiting source file." 158 "List of hook functions run by `next-error' after visiting source file."
159 :type 'hook 159 :type 'hook
160 :group 'next-error) 160 :group 'next-error)
161 161
@@ -407,7 +407,7 @@ Other major modes are defined by comparison with this one."
407 (define-key map "<" 'beginning-of-buffer) 407 (define-key map "<" 'beginning-of-buffer)
408 (define-key map "g" 'revert-buffer) 408 (define-key map "g" 'revert-buffer)
409 map)) 409 map))
410 410
411(put 'special-mode 'mode-class 'special) 411(put 'special-mode 'mode-class 'special)
412(define-derived-mode special-mode nil "Special" 412(define-derived-mode special-mode nil "Special"
413 "Parent major mode from which special major modes should inherit." 413 "Parent major mode from which special major modes should inherit."
@@ -1216,7 +1216,7 @@ in this use of the minibuffer.")
1216 (constrain-to-field nil (point-max))) 1216 (constrain-to-field nil (point-max)))
1217 1217
1218(defcustom minibuffer-history-case-insensitive-variables nil 1218(defcustom minibuffer-history-case-insensitive-variables nil
1219 "*Minibuffer history variables for which matching should ignore case. 1219 "Minibuffer history variables for which matching should ignore case.
1220If a history variable is a member of this list, then the 1220If a history variable is a member of this list, then the
1221\\[previous-matching-history-element] and \\[next-matching-history-element]\ 1221\\[previous-matching-history-element] and \\[next-matching-history-element]\
1222 commands ignore case when searching it, regardless of `case-fold-search'." 1222 commands ignore case when searching it, regardless of `case-fold-search'."
@@ -1559,7 +1559,7 @@ Otherwise, it displays the standard isearch message returned from
1559 (message ""))) 1559 (message "")))
1560 1560
1561(defun minibuffer-history-isearch-wrap () 1561(defun minibuffer-history-isearch-wrap ()
1562 "Wrap the minibuffer history search when search is failed. 1562 "Wrap the minibuffer history search when search fails.
1563Move point to the first history element for a forward search, 1563Move point to the first history element for a forward search,
1564or to the last history element for a backward search." 1564or to the last history element for a backward search."
1565 (unless isearch-word 1565 (unless isearch-word
@@ -2018,7 +2018,7 @@ to the end of the list of defaults just after the default value."
2018 (set-keymap-parent map minibuffer-local-map) 2018 (set-keymap-parent map minibuffer-local-map)
2019 (define-key map "\t" 'minibuffer-complete-shell-command) 2019 (define-key map "\t" 'minibuffer-complete-shell-command)
2020 map) 2020 map)
2021 "Keymap used for completiing shell commands in minibufffer.") 2021 "Keymap used for completing shell commands in minibuffer.")
2022 2022
2023(defun read-shell-command (prompt &optional initial-contents hist &rest args) 2023(defun read-shell-command (prompt &optional initial-contents hist &rest args)
2024 "Read a shell command from the minibuffer. 2024 "Read a shell command from the minibuffer.
@@ -2704,7 +2704,7 @@ string, then the caller of the function \(usually `current-kill')
2704should put this string in the kill ring as the latest kill. 2704should put this string in the kill ring as the latest kill.
2705 2705
2706This function may also return a list of strings if the window 2706This function may also return a list of strings if the window
2707system supports multiple selections. The first string will be 2707system supports multiple selections. The first string will be
2708used as the pasted text, but the other will be placed in the 2708used as the pasted text, but the other will be placed in the
2709kill ring for easy access via `yank-pop'. 2709kill ring for easy access via `yank-pop'.
2710 2710
@@ -2730,7 +2730,7 @@ interaction; you may want to use them instead of manipulating the kill
2730ring directly.") 2730ring directly.")
2731 2731
2732(defcustom kill-ring-max 60 2732(defcustom kill-ring-max 60
2733 "*Maximum length of kill ring before oldest elements are thrown away." 2733 "Maximum length of kill ring before oldest elements are thrown away."
2734 :type 'integer 2734 :type 'integer
2735 :group 'killing) 2735 :group 'killing)
2736 2736
@@ -2795,10 +2795,10 @@ If `interprogram-cut-function' is set, pass the resulting kill to it."
2795 2795
2796(defun current-kill (n &optional do-not-move) 2796(defun current-kill (n &optional do-not-move)
2797 "Rotate the yanking point by N places, and then return that kill. 2797 "Rotate the yanking point by N places, and then return that kill.
2798If N is zero, `interprogram-paste-function' is set, and calling it returns a 2798If N is zero, `interprogram-paste-function' is set, and calling
2799string or list of strings, then that string (or list) is added to the front 2799it returns a string or list of strings, then that string (or
2800of the kill ring and the string (or first string in the list) is returned as 2800list) is added to the front of the kill ring and the string (or
2801the latest kill. 2801first string in the list) is returned as the latest kill.
2802 2802
2803If N is not zero, and if `yank-pop-change-selection' is 2803If N is not zero, and if `yank-pop-change-selection' is
2804non-nil, use `interprogram-cut-function' to transfer the 2804non-nil, use `interprogram-cut-function' to transfer the
@@ -2838,7 +2838,7 @@ move the yanking point; just return the Nth kill forward."
2838;;;; Commands for manipulating the kill ring. 2838;;;; Commands for manipulating the kill ring.
2839 2839
2840(defcustom kill-read-only-ok nil 2840(defcustom kill-read-only-ok nil
2841 "*Non-nil means don't signal an error for killing read-only text." 2841 "Non-nil means don't signal an error for killing read-only text."
2842 :type 'boolean 2842 :type 'boolean
2843 :group 'killing) 2843 :group 'killing)
2844 2844
@@ -3092,7 +3092,7 @@ With argument, rotate that many kills forward (or backward, if negative)."
3092 (kill-region (point) (forward-point (- arg)))) 3092 (kill-region (point) (forward-point (- arg))))
3093 3093
3094(defcustom backward-delete-char-untabify-method 'untabify 3094(defcustom backward-delete-char-untabify-method 'untabify
3095 "*The method for untabifying when deleting backward. 3095 "The method for untabifying when deleting backward.
3096Can be `untabify' -- turn a tab to many spaces, then delete one space; 3096Can be `untabify' -- turn a tab to many spaces, then delete one space;
3097 `hungry' -- delete all whitespace, both tabs and spaces; 3097 `hungry' -- delete all whitespace, both tabs and spaces;
3098 `all' -- delete all whitespace, including tabs, spaces and newlines; 3098 `all' -- delete all whitespace, including tabs, spaces and newlines;
@@ -3146,7 +3146,7 @@ Goes backward if ARG is negative; error if CHAR not found."
3146;; kill-line and its subroutines. 3146;; kill-line and its subroutines.
3147 3147
3148(defcustom kill-whole-line nil 3148(defcustom kill-whole-line nil
3149 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line." 3149 "If non-nil, `kill-line' with no arg at beg of line kills the whole line."
3150 :type 'boolean 3150 :type 'boolean
3151 :group 'killing) 3151 :group 'killing)
3152 3152
@@ -3529,7 +3529,7 @@ for empty regions when `use-empty-active-region' is nil."
3529(put 'mark-ring 'permanent-local t) 3529(put 'mark-ring 'permanent-local t)
3530 3530
3531(defcustom mark-ring-max 16 3531(defcustom mark-ring-max 16
3532 "*Maximum size of mark ring. Start discarding off end if gets this big." 3532 "Maximum size of mark ring. Start discarding off end if gets this big."
3533 :type 'integer 3533 :type 'integer
3534 :group 'editing-basics) 3534 :group 'editing-basics)
3535 3535
@@ -3537,7 +3537,7 @@ for empty regions when `use-empty-active-region' is nil."
3537 "The list of saved global marks, most recent first.") 3537 "The list of saved global marks, most recent first.")
3538 3538
3539(defcustom global-mark-ring-max 16 3539(defcustom global-mark-ring-max 16
3540 "*Maximum size of global mark ring. \ 3540 "Maximum size of global mark ring. \
3541Start discarding off end if gets this big." 3541Start discarding off end if gets this big."
3542 :type 'integer 3542 :type 'integer
3543 :group 'editing-basics) 3543 :group 'editing-basics)
@@ -3567,7 +3567,7 @@ Display `Mark set' unless the optional second arg NOMSG is non-nil."
3567 (message "Mark activated"))))) 3567 (message "Mark activated")))))
3568 3568
3569(defcustom set-mark-command-repeat-pop nil 3569(defcustom set-mark-command-repeat-pop nil
3570 "*Non-nil means repeating \\[set-mark-command] after popping mark pops it again. 3570 "Non-nil means repeating \\[set-mark-command] after popping mark pops it again.
3571That means that C-u \\[set-mark-command] \\[set-mark-command] 3571That means that C-u \\[set-mark-command] \\[set-mark-command]
3572will pop the mark twice, and 3572will pop the mark twice, and
3573C-u \\[set-mark-command] \\[set-mark-command] \\[set-mark-command] 3573C-u \\[set-mark-command] \\[set-mark-command] \\[set-mark-command]
@@ -3738,7 +3738,7 @@ With optional arg DEACTIVATE, only perform region deactivation."
3738 3738
3739(define-minor-mode transient-mark-mode 3739(define-minor-mode transient-mark-mode
3740 "Toggle Transient Mark mode. 3740 "Toggle Transient Mark mode.
3741With arg, turn Transient Mark mode on if arg is positive, off otherwise. 3741With ARG, turn Transient Mark mode on if ARG is positive, off otherwise.
3742 3742
3743In Transient Mark mode, when the mark is active, the region is highlighted. 3743In Transient Mark mode, when the mark is active, the region is highlighted.
3744Changing the buffer \"deactivates\" the mark. 3744Changing the buffer \"deactivates\" the mark.
@@ -3771,10 +3771,9 @@ Non-nil also enables highlighting of the region whenever the mark is active.
3771The variable `highlight-nonselected-windows' controls whether to highlight 3771The variable `highlight-nonselected-windows' controls whether to highlight
3772all windows or just the selected window. 3772all windows or just the selected window.
3773 3773
3774If the value is `lambda', that enables Transient Mark mode 3774If the value is `lambda', that enables Transient Mark mode temporarily.
3775temporarily. After any subsequent action that would normally 3775After any subsequent action that would normally deactivate the mark
3776deactivate the mark (such as buffer modification), Transient Mark mode 3776\(such as buffer modification), Transient Mark mode is turned off.
3777is turned off.
3778 3777
3779If the value is (only . OLDVAL), that enables Transient Mark mode 3778If the value is (only . OLDVAL), that enables Transient Mark mode
3780temporarily. After any subsequent point motion command that is not 3779temporarily. After any subsequent point motion command that is not
@@ -3813,7 +3812,7 @@ as a fallback, and won't change the buffer bounds.")
3813 (switch-to-buffer buffer))) 3812 (switch-to-buffer buffer)))
3814 3813
3815(defcustom next-line-add-newlines nil 3814(defcustom next-line-add-newlines nil
3816 "*If non-nil, `next-line' inserts newline to avoid `end of buffer' error." 3815 "If non-nil, `next-line' inserts newline to avoid `end of buffer' error."
3817 :type 'boolean 3816 :type 'boolean
3818 :version "21.1" 3817 :version "21.1"
3819 :group 'editing-basics) 3818 :group 'editing-basics)
@@ -3890,7 +3889,7 @@ to use and more reliable (no dependence on goal column, etc.)."
3890 nil) 3889 nil)
3891 3890
3892(defcustom track-eol nil 3891(defcustom track-eol nil
3893 "*Non-nil means vertical motion starting at end of line keeps to ends of lines. 3892 "Non-nil means vertical motion starting at end of line keeps to ends of lines.
3894This means moving to the end of each line moved onto. 3893This means moving to the end of each line moved onto.
3895The beginning of a blank line does not count as the end of a line. 3894The beginning of a blank line does not count as the end of a line.
3896This has no effect when `line-move-visual' is non-nil." 3895This has no effect when `line-move-visual' is non-nil."
@@ -3898,7 +3897,7 @@ This has no effect when `line-move-visual' is non-nil."
3898 :group 'editing-basics) 3897 :group 'editing-basics)
3899 3898
3900(defcustom goal-column nil 3899(defcustom goal-column nil
3901 "*Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil." 3900 "Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil."
3902 :type '(choice integer 3901 :type '(choice integer
3903 (const :tag "None" nil)) 3902 (const :tag "None" nil))
3904 :group 'editing-basics) 3903 :group 'editing-basics)
@@ -3914,7 +3913,7 @@ the `track-eol' feature is doing its job, the value is
3914`most-positive-fixnum'.") 3913`most-positive-fixnum'.")
3915 3914
3916(defcustom line-move-ignore-invisible t 3915(defcustom line-move-ignore-invisible t
3917 "*Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines. 3916 "Non-nil means \\[next-line] and \\[previous-line] ignore invisible lines.
3918Outline mode sets this." 3917Outline mode sets this."
3919 :type 'boolean 3918 :type 'boolean
3920 :group 'editing-basics) 3919 :group 'editing-basics)
@@ -4461,7 +4460,7 @@ even beep.)"
4461 4460
4462(defun next-logical-line (&optional arg try-vscroll) 4461(defun next-logical-line (&optional arg try-vscroll)
4463 "Move cursor vertically down ARG lines. 4462 "Move cursor vertically down ARG lines.
4464This is identical to `previous-line', except that it always moves 4463This is identical to `next-line', except that it always moves
4465by logical lines instead of visual lines, ignoring the value of 4464by logical lines instead of visual lines, ignoring the value of
4466the variable `line-move-visual'." 4465the variable `line-move-visual'."
4467 (interactive "^p\np") 4466 (interactive "^p\np")
@@ -4806,7 +4805,7 @@ If optional arg REALLY-WORD is non-nil, it finds just a word."
4806 (buffer-substring-no-properties start end))))) 4805 (buffer-substring-no-properties start end)))))
4807 4806
4808(defcustom fill-prefix nil 4807(defcustom fill-prefix nil
4809 "*String for filling to insert at front of new line, or nil for none." 4808 "String for filling to insert at front of new line, or nil for none."
4810 :type '(choice (const :tag "None" nil) 4809 :type '(choice (const :tag "None" nil)
4811 string) 4810 string)
4812 :group 'fill) 4811 :group 'fill)
@@ -4814,7 +4813,7 @@ If optional arg REALLY-WORD is non-nil, it finds just a word."
4814(put 'fill-prefix 'safe-local-variable 'string-or-null-p) 4813(put 'fill-prefix 'safe-local-variable 'string-or-null-p)
4815 4814
4816(defcustom auto-fill-inhibit-regexp nil 4815(defcustom auto-fill-inhibit-regexp nil
4817 "*Regexp to match lines which should not be auto-filled." 4816 "Regexp to match lines which should not be auto-filled."
4818 :type '(choice (const :tag "None" nil) 4817 :type '(choice (const :tag "None" nil)
4819 regexp) 4818 regexp)
4820 :group 'fill) 4819 :group 'fill)
@@ -4956,7 +4955,7 @@ Some major modes set this.")
4956;; Add a global minor mode version of it. 4955;; Add a global minor mode version of it.
4957(defun auto-fill-mode (&optional arg) 4956(defun auto-fill-mode (&optional arg)
4958 "Toggle Auto Fill mode. 4957 "Toggle Auto Fill mode.
4959With arg, turn Auto Fill mode on if and only if arg is positive. 4958With ARG, turn Auto Fill mode on if and only if ARG is positive.
4960In Auto Fill mode, inserting a space at a column beyond `current-fill-column' 4959In Auto Fill mode, inserting a space at a column beyond `current-fill-column'
4961automatically breaks the line at a previous space. 4960automatically breaks the line at a previous space.
4962 4961
@@ -5030,8 +5029,8 @@ The variable `selective-display' has a separate value for each buffer."
5030(defun toggle-truncate-lines (&optional arg) 5029(defun toggle-truncate-lines (&optional arg)
5031 "Toggle whether to fold or truncate long lines for the current buffer. 5030 "Toggle whether to fold or truncate long lines for the current buffer.
5032With prefix argument ARG, truncate long lines if ARG is positive, 5031With prefix argument ARG, truncate long lines if ARG is positive,
5033otherwise don't truncate them. Note that in side-by-side 5032otherwise don't truncate them. Note that in side-by-side windows,
5034windows, this command has no effect if `truncate-partial-width-windows' 5033this command has no effect if `truncate-partial-width-windows'
5035is non-nil." 5034is non-nil."
5036 (interactive "P") 5035 (interactive "P")
5037 (setq truncate-lines 5036 (setq truncate-lines
@@ -5092,7 +5091,7 @@ specialization of overwrite mode, entered by setting the
5092 5091
5093(define-minor-mode line-number-mode 5092(define-minor-mode line-number-mode
5094 "Toggle Line Number mode. 5093 "Toggle Line Number mode.
5095With arg, turn Line Number mode on if arg is positive, otherwise 5094With ARG, turn Line Number mode on if ARG is positive, otherwise
5096turn it off. When Line Number mode is enabled, the line number 5095turn it off. When Line Number mode is enabled, the line number
5097appears in the mode line. 5096appears in the mode line.
5098 5097
@@ -5103,14 +5102,14 @@ and `line-number-display-limit-width'."
5103 5102
5104(define-minor-mode column-number-mode 5103(define-minor-mode column-number-mode
5105 "Toggle Column Number mode. 5104 "Toggle Column Number mode.
5106With arg, turn Column Number mode on if arg is positive, 5105With ARG, turn Column Number mode on if ARG is positive,
5107otherwise turn it off. When Column Number mode is enabled, the 5106otherwise turn it off. When Column Number mode is enabled, the
5108column number appears in the mode line." 5107column number appears in the mode line."
5109 :global t :group 'mode-line) 5108 :global t :group 'mode-line)
5110 5109
5111(define-minor-mode size-indication-mode 5110(define-minor-mode size-indication-mode
5112 "Toggle Size Indication mode. 5111 "Toggle Size Indication mode.
5113With arg, turn Size Indication mode on if arg is positive, 5112With ARG, turn Size Indication mode on if ARG is positive,
5114otherwise turn it off. When Size Indication mode is enabled, the 5113otherwise turn it off. When Size Indication mode is enabled, the
5115size of the accessible part of the buffer appears in the mode line." 5114size of the accessible part of the buffer appears in the mode line."
5116 :global t :group 'mode-line) 5115 :global t :group 'mode-line)
@@ -5121,12 +5120,12 @@ size of the accessible part of the buffer appears in the mode line."
5121 :group 'paren-matching) 5120 :group 'paren-matching)
5122 5121
5123(defcustom blink-matching-paren t 5122(defcustom blink-matching-paren t
5124 "*Non-nil means show matching open-paren when close-paren is inserted." 5123 "Non-nil means show matching open-paren when close-paren is inserted."
5125 :type 'boolean 5124 :type 'boolean
5126 :group 'paren-blinking) 5125 :group 'paren-blinking)
5127 5126
5128(defcustom blink-matching-paren-on-screen t 5127(defcustom blink-matching-paren-on-screen t
5129 "*Non-nil means show matching open-paren when it is on screen. 5128 "Non-nil means show matching open-paren when it is on screen.
5130If nil, don't show it (but the open-paren can still be shown 5129If nil, don't show it (but the open-paren can still be shown
5131when it is off screen). 5130when it is off screen).
5132 5131
@@ -5137,18 +5136,18 @@ It is also ignored if `show-paren-mode' is enabled."
5137 :group 'paren-blinking) 5136 :group 'paren-blinking)
5138 5137
5139(defcustom blink-matching-paren-distance (* 25 1024) 5138(defcustom blink-matching-paren-distance (* 25 1024)
5140 "*If non-nil, maximum distance to search backwards for matching open-paren. 5139 "If non-nil, maximum distance to search backwards for matching open-paren.
5141If nil, search stops at the beginning of the accessible portion of the buffer." 5140If nil, search stops at the beginning of the accessible portion of the buffer."
5142 :type '(choice (const nil) integer) 5141 :type '(choice (const nil) integer)
5143 :group 'paren-blinking) 5142 :group 'paren-blinking)
5144 5143
5145(defcustom blink-matching-delay 1 5144(defcustom blink-matching-delay 1
5146 "*Time in seconds to delay after showing a matching paren." 5145 "Time in seconds to delay after showing a matching paren."
5147 :type 'number 5146 :type 'number
5148 :group 'paren-blinking) 5147 :group 'paren-blinking)
5149 5148
5150(defcustom blink-matching-paren-dont-ignore-comments nil 5149(defcustom blink-matching-paren-dont-ignore-comments nil
5151 "*If nil, `blink-matching-paren' ignores comments. 5150 "If nil, `blink-matching-paren' ignores comments.
5152More precisely, when looking for the matching parenthesis, 5151More precisely, when looking for the matching parenthesis,
5153it skips the contents of comments that end before point." 5152it skips the contents of comments that end before point."
5154 :type 'boolean 5153 :type 'boolean
@@ -5251,7 +5250,6 @@ it skips the contents of comments that end before point."
5251 (message "Matches %s" 5250 (message "Matches %s"
5252 (substring-no-properties open-paren-line-string))))))))) 5251 (substring-no-properties open-paren-line-string)))))))))
5253 5252
5254;; Turned off because it makes dbx bomb out.
5255(setq blink-paren-function 'blink-matching-open) 5253(setq blink-paren-function 'blink-matching-open)
5256 5254
5257;; This executes C-g typed while Emacs is waiting for a command. 5255;; This executes C-g typed while Emacs is waiting for a command.
@@ -5312,7 +5310,7 @@ specification for `play-sound'."
5312 5310
5313 5311
5314(defcustom read-mail-command 'rmail 5312(defcustom read-mail-command 'rmail
5315 "*Your preference for a mail reading package. 5313 "Your preference for a mail reading package.
5316This is used by some keybindings which support reading mail. 5314This is used by some keybindings which support reading mail.
5317See also `mail-user-agent' concerning sending mail." 5315See also `mail-user-agent' concerning sending mail."
5318 :type '(choice (function-item rmail) 5316 :type '(choice (function-item rmail)
@@ -5323,7 +5321,7 @@ See also `mail-user-agent' concerning sending mail."
5323 :group 'mail) 5321 :group 'mail)
5324 5322
5325(defcustom mail-user-agent 'sendmail-user-agent 5323(defcustom mail-user-agent 'sendmail-user-agent
5326 "*Your preference for a mail composition package. 5324 "Your preference for a mail composition package.
5327Various Emacs Lisp packages (e.g. Reporter) require you to compose an 5325Various Emacs Lisp packages (e.g. Reporter) require you to compose an
5328outgoing email message. This variable lets you specify which 5326outgoing email message. This variable lets you specify which
5329mail-sending package you prefer. 5327mail-sending package you prefer.
@@ -6049,7 +6047,9 @@ Give the indirect buffer name NEWNAME. Interactively, read NEWNAME
6049from the minibuffer when invoked with a prefix arg. If NEWNAME is nil 6047from the minibuffer when invoked with a prefix arg. If NEWNAME is nil
6050or if not called with a prefix arg, NEWNAME defaults to the current 6048or if not called with a prefix arg, NEWNAME defaults to the current
6051buffer's name. The name is modified by adding a `<N>' suffix to it 6049buffer's name. The name is modified by adding a `<N>' suffix to it
6052or by incrementing the N in an existing suffix. 6050or by incrementing the N in an existing suffix. Trying to clone a
6051buffer whose major mode symbol has a non-nil `no-clone-indirect'
6052property results in an error.
6053 6053
6054DISPLAY-FLAG non-nil means show the new buffer with `pop-to-buffer'. 6054DISPLAY-FLAG non-nil means show the new buffer with `pop-to-buffer'.
6055This is always done when called interactively. 6055This is always done when called interactively.
@@ -6151,7 +6151,7 @@ call `normal-erase-is-backspace-mode' (which see) instead."
6151(defun normal-erase-is-backspace-mode (&optional arg) 6151(defun normal-erase-is-backspace-mode (&optional arg)
6152 "Toggle the Erase and Delete mode of the Backspace and Delete keys. 6152 "Toggle the Erase and Delete mode of the Backspace and Delete keys.
6153 6153
6154With numeric arg, turn the mode on if and only if ARG is positive. 6154With numeric ARG, turn the mode on if and only if ARG is positive.
6155 6155
6156On window systems, when this mode is on, Delete is mapped to C-d 6156On window systems, when this mode is on, Delete is mapped to C-d
6157and Backspace is mapped to DEL; when this mode is off, both 6157and Backspace is mapped to DEL; when this mode is off, both
@@ -6240,8 +6240,8 @@ With argument ARG turn Visible mode on if ARG is positive, otherwise
6240turn it off. 6240turn it off.
6241 6241
6242Enabling Visible mode makes all invisible text temporarily visible. 6242Enabling Visible mode makes all invisible text temporarily visible.
6243Disabling Visible mode turns off that effect. Visible mode 6243Disabling Visible mode turns off that effect. Visible mode works by
6244works by saving the value of `buffer-invisibility-spec' and setting it to nil." 6244saving the value of `buffer-invisibility-spec' and setting it to nil."
6245 :lighter " Vis" 6245 :lighter " Vis"
6246 :group 'editing-basics 6246 :group 'editing-basics
6247 (when (local-variable-p 'vis-mode-saved-buffer-invisibility-spec) 6247 (when (local-variable-p 'vis-mode-saved-buffer-invisibility-spec)