aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/obsolete
diff options
context:
space:
mode:
authorPaul Eggert2015-08-24 23:39:33 -0700
committerPaul Eggert2015-08-24 23:57:25 -0700
commit875a5d0ead827d3da32ecbd30e739a29f07bbc87 (patch)
treeedb42bf8ed4e7d975c6dcbdbe1f4ab0d44f86925 /lisp/obsolete
parent68280c5ee9b87d874ffa7c111b3cac7e634cee22 (diff)
downloademacs-875a5d0ead827d3da32ecbd30e739a29f07bbc87.tar.gz
emacs-875a5d0ead827d3da32ecbd30e739a29f07bbc87.zip
Prefer directed to neutral quotes
Prefer directed to neutral quotes in docstings and diagnostics. In docstrings, escape apostrophes that would otherwise be translated to curved quotes using the newer, simpler rules. * admin/unidata/unidata-gen.el (unidata-gen-table): * lisp/align.el (align-region): * lisp/allout.el (allout-mode, allout-solicit-alternate-bullet): * lisp/bookmark.el (bookmark-default-annotation-text): * lisp/calc/calc-aent.el (math-read-if, math-read-factor): * lisp/calc/calc-lang.el (math-read-giac-subscr) (math-read-math-subscr): * lisp/calc/calc-misc.el (report-calc-bug): * lisp/calc/calc-prog.el (calc-fix-token-name) (calc-read-parse-table-part): * lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules): * lisp/cedet/semantic/complete.el (semantic-displayor-show-request): * lisp/dabbrev.el (dabbrev-expand): * lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine): * lisp/emacs-lisp/elint.el (elint-get-top-forms): * lisp/emacs-lisp/lisp-mnt.el (lm-verify): * lisp/emulation/viper-cmd.el (viper-toggle-search-style): * lisp/erc/erc-button.el (erc-nick-popup): * lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login): * lisp/eshell/em-dirs.el (eshell/cd): * lisp/eshell/em-glob.el (eshell-glob-regexp): * lisp/eshell/em-pred.el (eshell-parse-modifiers): * lisp/eshell/esh-arg.el (eshell-parse-arguments): * lisp/eshell/esh-opt.el (eshell-show-usage): * lisp/files-x.el (modify-file-local-variable): * lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer) (filesets-update-pre010505): * lisp/find-cmd.el (find-generic, find-to-string): * lisp/gnus/auth-source.el (auth-source-netrc-parse-entries): * lisp/gnus/gnus-agent.el (gnus-agent-check-overview-buffer) (gnus-agent-fetch-headers): * lisp/gnus/gnus-int.el (gnus-start-news-server): * lisp/gnus/gnus-registry.el: (gnus-registry--split-fancy-with-parent-internal): * lisp/gnus/gnus-score.el (gnus-summary-increase-score): * lisp/gnus/gnus-start.el (gnus-convert-old-newsrc): * lisp/gnus/gnus-topic.el (gnus-topic-rename): * lisp/gnus/legacy-gnus-agent.el (gnus-agent-unlist-expire-days): * lisp/gnus/nnmairix.el (nnmairix-widget-create-query): * lisp/gnus/spam.el (spam-check-blackholes): * lisp/mail/feedmail.el (feedmail-run-the-queue): * lisp/mpc.el (mpc-playlist-rename): * lisp/net/ange-ftp.el (ange-ftp-shell-command): * lisp/net/mairix.el (mairix-widget-create-query): * lisp/net/tramp-cache.el: * lisp/obsolete/otodo-mode.el (todo-more-important-p): * lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region): * lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region): * lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region): * lisp/org/ob-core.el (org-babel-goto-named-src-block) (org-babel-goto-named-result): * lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap): * lisp/org/ob-ref.el (org-babel-ref-resolve): * lisp/org/org-agenda.el (org-agenda-prepare): * lisp/org/org-bibtex.el (org-bibtex-fields): * lisp/org/org-clock.el (org-clock-notify-once-if-expired) (org-clock-resolve): * lisp/org/org-feed.el (org-feed-parse-atom-entry): * lisp/org/org-habit.el (org-habit-parse-todo): * lisp/org/org-mouse.el (org-mouse-popup-global-menu) (org-mouse-context-menu): * lisp/org/org-table.el (org-table-edit-formulas): * lisp/org/ox.el (org-export-async-start): * lisp/play/dunnet.el (dun-score, dun-help, dun-endgame-question) (dun-rooms, dun-endgame-questions): * lisp/progmodes/ada-mode.el (ada-goto-matching-start): * lisp/progmodes/ada-xref.el (ada-find-executable): * lisp/progmodes/antlr-mode.el (antlr-options-alists): * lisp/progmodes/flymake.el (flymake-parse-err-lines) (flymake-start-syntax-check-process): * lisp/progmodes/python.el (python-define-auxiliary-skeleton): * lisp/progmodes/sql.el (sql-comint): * lisp/progmodes/verilog-mode.el (verilog-load-file-at-point): * lisp/server.el (server-get-auth-key): * lisp/subr.el (version-to-list): * lisp/textmodes/reftex-ref.el (reftex-label): * lisp/textmodes/reftex-toc.el (reftex-toc-rename-label): * lisp/vc/ediff-diff.el (ediff-same-contents): * lisp/vc/vc-cvs.el (vc-cvs-mode-line-string): * test/automated/tramp-tests.el (tramp-test33-asynchronous-requests): Use directed rather than neutral quotes in diagnostics.
Diffstat (limited to 'lisp/obsolete')
-rw-r--r--lisp/obsolete/iso-acc.el6
-rw-r--r--lisp/obsolete/iswitchb.el4
-rw-r--r--lisp/obsolete/landmark.el2
-rw-r--r--lisp/obsolete/lmenu.el6
-rw-r--r--lisp/obsolete/old-whitespace.el2
-rw-r--r--lisp/obsolete/otodo-mode.el4
-rw-r--r--lisp/obsolete/pgg-gpg.el2
-rw-r--r--lisp/obsolete/pgg-pgp.el2
-rw-r--r--lisp/obsolete/pgg-pgp5.el10
-rw-r--r--lisp/obsolete/scribe.el8
-rw-r--r--lisp/obsolete/sregex.el10
-rw-r--r--lisp/obsolete/tpu-edt.el6
-rw-r--r--lisp/obsolete/vc-arch.el2
-rw-r--r--lisp/obsolete/vi.el10
14 files changed, 37 insertions, 37 deletions
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index 499a9da1040..c612849c685 100644
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -55,7 +55,7 @@
55;; 55;;
56;; If the pseudo-accent is followed by anything else than a 56;; If the pseudo-accent is followed by anything else than a
57;; self-insert-command, the dead-key code is terminated, the 57;; self-insert-command, the dead-key code is terminated, the
58;; pseudo-accent inserted 'as is' and the bell is rung to signal this. 58;; pseudo-accent inserted as is and the bell is rung to signal this.
59;; 59;;
60;; Function `iso-accents-mode' can be used to enable the iso accents 60;; Function `iso-accents-mode' can be used to enable the iso accents
61;; minor mode, or disable it. 61;; minor mode, or disable it.
@@ -272,7 +272,7 @@ See the function `iso-accents-mode'."
272 272
273(defcustom iso-accents-enable '(?' ?` ?^ ?\" ?~ ?/) 273(defcustom iso-accents-enable '(?' ?` ?^ ?\" ?~ ?/)
274 "List of accent keys that become prefixes in ISO Accents mode. 274 "List of accent keys that become prefixes in ISO Accents mode.
275The default is (?' ?\\=` ?^ ?\" ?~ ?/), which contains all the supported 275The default is (?\\=' ?\\=` ?^ ?\" ?~ ?/), which contains all the supported
276accent keys. If you set this variable to a list in which some of those 276accent keys. If you set this variable to a list in which some of those
277characters are missing, the missing ones do not act as accents. 277characters are missing, the missing ones do not act as accents.
278 278
@@ -346,7 +346,7 @@ the language you choose)."
346 "Toggle ISO Accents mode, in which accents modify the following letter. 346 "Toggle ISO Accents mode, in which accents modify the following letter.
347This permits easy insertion of accented characters according to ISO-8859-1. 347This permits easy insertion of accented characters according to ISO-8859-1.
348When Iso-accents mode is enabled, accent character keys 348When Iso-accents mode is enabled, accent character keys
349\(\\=`, ', \", ^, / and ~) do not self-insert; instead, they modify the following 349\(\\=`, \\=', \", ^, / and ~) do not self-insert; instead, they modify the following
350letter key so that it inserts an ISO accented letter. 350letter key so that it inserts an ISO accented letter.
351 351
352You can customize ISO Accents mode to a particular language 352You can customize ISO Accents mode to a particular language
diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el
index e0d78e1bcf6..61f9d7f741f 100644
--- a/lisp/obsolete/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@@ -389,8 +389,8 @@ See documentation of `walk-windows' for useful values."
389 389
390This hook is run during minibuffer setup if `iswitchb' is active. 390This hook is run during minibuffer setup if `iswitchb' is active.
391For instance: 391For instance:
392\(add-hook 'iswitchb-minibuffer-setup-hook 392\(add-hook \\='iswitchb-minibuffer-setup-hook
393 '\(lambda () (set (make-local-variable 'max-mini-window-height) 3))) 393 \\='\(lambda () (set (make-local-variable \\='max-mini-window-height) 3)))
394will constrain the minibuffer to a maximum height of 3 lines when 394will constrain the minibuffer to a maximum height of 3 lines when
395iswitchb is running." 395iswitchb is running."
396 :type 'hook 396 :type 'hook
diff --git a/lisp/obsolete/landmark.el b/lisp/obsolete/landmark.el
index cd397ae752a..39684a781cc 100644
--- a/lisp/obsolete/landmark.el
+++ b/lisp/obsolete/landmark.el
@@ -866,7 +866,7 @@ If the game is finished, this command requests for another game."
866 (move-to-column (+ landmark-x-offset (* landmark-square-width (1- x))))) 866 (move-to-column (+ landmark-x-offset (* landmark-square-width (1- x)))))
867 867
868(defun landmark-plot-square (square value) 868(defun landmark-plot-square (square value)
869 "Draw 'X', 'O' or '.' on SQUARE depending on VALUE, leave point there." 869 "Draw X, O or . on SQUARE depending on VALUE, leave point there."
870 (or (= value 1) 870 (or (= value 1)
871 (landmark-goto-square square)) 871 (landmark-goto-square square))
872 (let ((inhibit-read-only t)) 872 (let ((inhibit-read-only t))
diff --git a/lisp/obsolete/lmenu.el b/lisp/obsolete/lmenu.el
index e4886ab633d..97643826a9f 100644
--- a/lisp/obsolete/lmenu.el
+++ b/lisp/obsolete/lmenu.el
@@ -160,9 +160,9 @@ The syntax, more precisely:
160 active-p := <t, nil, or a form to evaluate to decide whether this 160 active-p := <t, nil, or a form to evaluate to decide whether this
161 button should be selectable> 161 button should be selectable>
162 name := <string> 162 name := <string>
163 partition := 'nil' 163 partition := `nil'
164 button := '[' name callback active-p ']' 164 button := `[' name callback active-p `]'
165 dialog := '(' name [ button ]+ [ partition [ button ]+ ] ')'" 165 dialog := `(' name [ button ]+ [ partition [ button ]+ ] `)'"
166 (let ((name (car data)) 166 (let ((name (car data))
167 (tail (cdr data)) 167 (tail (cdr data))
168 converted 168 converted
diff --git a/lisp/obsolete/old-whitespace.el b/lisp/obsolete/old-whitespace.el
index 4619a5852a7..00b32145728 100644
--- a/lisp/obsolete/old-whitespace.el
+++ b/lisp/obsolete/old-whitespace.el
@@ -259,7 +259,7 @@ These are mostly programming and documentation modes. But you may add other
259modes that you want whitespaces checked in by adding something like the 259modes that you want whitespaces checked in by adding something like the
260following to your `.emacs': 260following to your `.emacs':
261 261
262\(setq whitespace-modes (cons 'my-mode (cons 'my-other-mode 262\(setq whitespace-modes (cons \\='my-mode (cons \\='my-other-mode
263 whitespace-modes))\) 263 whitespace-modes))\)
264 264
265Or, alternately, you can use the Emacs `customize' command to set this." 265Or, alternately, you can use the Emacs `customize' command to set this."
diff --git a/lisp/obsolete/otodo-mode.el b/lisp/obsolete/otodo-mode.el
index 04b881094df..be067f80a06 100644
--- a/lisp/obsolete/otodo-mode.el
+++ b/lisp/obsolete/otodo-mode.el
@@ -648,7 +648,7 @@ If point is on an empty line, insert the entry there."
648 (forward-line (1- todo-previous-line)) 648 (forward-line (1- todo-previous-line))
649 (let ((item (todo-item-string-start))) 649 (let ((item (todo-item-string-start)))
650 (setq todo-previous-answer 650 (setq todo-previous-answer
651 (y-or-n-p (concat "More important than '" item "'? "))))) 651 (y-or-n-p (format-message "More important than ‘%s’? " item)))))
652 todo-previous-answer) 652 todo-previous-answer)
653(defalias 'todo-ask-p 'todo-more-important-p) 653(defalias 'todo-ask-p 'todo-more-important-p)
654 654
@@ -734,7 +734,7 @@ If point is on an empty line, insert the entry there."
734Number of entries for each category is given by NOF-PRIORITIES which 734Number of entries for each category is given by NOF-PRIORITIES which
735defaults to `todo-show-priorities'. 735defaults to `todo-show-priorities'.
736 736
737If CATEGORY-PR-PAGE is non-nil, a page separator '^L' is inserted 737If CATEGORY-PR-PAGE is non-nil, a page separator `^L' is inserted
738between each category. 738between each category.
739INTERACTIVE should be non-nil if this function is called interactively." 739INTERACTIVE should be non-nil if this function is called interactively."
740 740
diff --git a/lisp/obsolete/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el
index 5b405e40c2c..cd29c613aab 100644
--- a/lisp/obsolete/pgg-gpg.el
+++ b/lisp/obsolete/pgg-gpg.el
@@ -122,7 +122,7 @@
122 (insert-file-contents output-file-name))) 122 (insert-file-contents output-file-name)))
123 (set-buffer errors-buffer) 123 (set-buffer errors-buffer)
124 (if (memq status '(stop signal)) 124 (if (memq status '(stop signal))
125 (error "%s exited abnormally: '%s'" program exit-status)) 125 (error "%s exited abnormally: %s" program exit-status))
126 (if (= 127 exit-status) 126 (if (= 127 exit-status)
127 (error "%s could not be found" program)))) 127 (error "%s could not be found" program))))
128 (if passphrase-with-newline 128 (if passphrase-with-newline
diff --git a/lisp/obsolete/pgg-pgp.el b/lisp/obsolete/pgg-pgp.el
index af2b2aa7aed..ee7af04c447 100644
--- a/lisp/obsolete/pgg-pgp.el
+++ b/lisp/obsolete/pgg-pgp.el
@@ -99,7 +99,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
99 (pgg-convert-lbt-region (point-min)(point-max) 'LF) 99 (pgg-convert-lbt-region (point-min)(point-max) 'LF)
100 100
101 (if (memq status '(stop signal)) 101 (if (memq status '(stop signal))
102 (error "%s exited abnormally: '%s'" program exit-status)) 102 (error "%s exited abnormally: %s" program exit-status))
103 (if (= 127 exit-status) 103 (if (= 127 exit-status)
104 (error "%s could not be found" program)) 104 (error "%s could not be found" program))
105 105
diff --git a/lisp/obsolete/pgg-pgp5.el b/lisp/obsolete/pgg-pgp5.el
index 97caedbe5b3..d87c6fd9020 100644
--- a/lisp/obsolete/pgg-pgp5.el
+++ b/lisp/obsolete/pgg-pgp5.el
@@ -35,22 +35,22 @@
35 :group 'pgg) 35 :group 'pgg)
36 36
37(defcustom pgg-pgp5-pgpe-program "pgpe" 37(defcustom pgg-pgp5-pgpe-program "pgpe"
38 "PGP 5.* 'pgpe' executable." 38 "PGP 5.* `pgpe' executable."
39 :group 'pgg-pgp5 39 :group 'pgg-pgp5
40 :type 'string) 40 :type 'string)
41 41
42(defcustom pgg-pgp5-pgps-program "pgps" 42(defcustom pgg-pgp5-pgps-program "pgps"
43 "PGP 5.* 'pgps' executable." 43 "PGP 5.* `pgps' executable."
44 :group 'pgg-pgp5 44 :group 'pgg-pgp5
45 :type 'string) 45 :type 'string)
46 46
47(defcustom pgg-pgp5-pgpk-program "pgpk" 47(defcustom pgg-pgp5-pgpk-program "pgpk"
48 "PGP 5.* 'pgpk' executable." 48 "PGP 5.* `pgpk' executable."
49 :group 'pgg-pgp5 49 :group 'pgg-pgp5
50 :type 'string) 50 :type 'string)
51 51
52(defcustom pgg-pgp5-pgpv-program "pgpv" 52(defcustom pgg-pgp5-pgpv-program "pgpv"
53 "PGP 5.* 'pgpv' executable." 53 "PGP 5.* `pgpv' executable."
54 :group 'pgg-pgp5 54 :group 'pgg-pgp5
55 :type 'string) 55 :type 'string)
56 56
@@ -115,7 +115,7 @@ Bourne shell or its equivalent \(not tcsh) is needed for \"2>\"."
115 (pgg-convert-lbt-region (point-min)(point-max) 'LF) 115 (pgg-convert-lbt-region (point-min)(point-max) 'LF)
116 116
117 (if (memq status '(stop signal)) 117 (if (memq status '(stop signal))
118 (error "%s exited abnormally: '%s'" program exit-status)) 118 (error "%s exited abnormally: %s" program exit-status))
119 (if (= 127 exit-status) 119 (if (= 127 exit-status)
120 (error "%s could not be found" program)) 120 (error "%s could not be found" program))
121 121
diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el
index 68b2208063b..e28e0aba091 100644
--- a/lisp/obsolete/scribe.el
+++ b/lisp/obsolete/scribe.el
@@ -50,7 +50,7 @@
50 :group 'scribe) 50 :group 'scribe)
51 51
52(defcustom scribe-electric-quote nil 52(defcustom scribe-electric-quote nil
53 "Non-nil makes insert of double quote use \\=`\\=` or '' depending on context." 53 "Non-nil makes insert of double quote use \\=`\\=` or \\='\\=' depending on context."
54 :type 'boolean 54 :type 'boolean
55 :group 'scribe) 55 :group 'scribe)
56 56
@@ -124,7 +124,7 @@ Interesting variables:
124 Non-nil makes Scribe mode use a different style of paragraph separation. 124 Non-nil makes Scribe mode use a different style of paragraph separation.
125 125
126`scribe-electric-quote' 126`scribe-electric-quote'
127 Non-nil makes insert of double quote use \\=`\\=` or '' depending on context. 127 Non-nil makes insert of double quote use \\=`\\=` or \\='\\=' depending on context.
128 128
129`scribe-electric-parenthesis' 129`scribe-electric-parenthesis'
130 Non-nil makes an open-parenthesis char (one of `([<{') 130 Non-nil makes an open-parenthesis char (one of `([<{')
@@ -265,8 +265,8 @@ to skip backward."
265 (forward-char -1)) 265 (forward-char -1))
266 266
267(defun scribe-insert-quote (count) 267(defun scribe-insert-quote (count)
268 "Insert \\=`\\=`, '' or \" according to preceding character. 268 "Insert \\=`\\=`, \\='\\=' or \" according to preceding character.
269If `scribe-electric-quote' is non-nil, insert \\=`\\=`, '' or \" according 269If `scribe-electric-quote' is non-nil, insert \\=`\\=`, \\='\\=' or \" according
270to preceding character. With numeric arg N, always insert N \" characters. 270to preceding character. With numeric arg N, always insert N \" characters.
271Else just insert \"." 271Else just insert \"."
272 (interactive "P") 272 (interactive "P")
diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el
index 80b2c92be09..0a15f50be28 100644
--- a/lisp/obsolete/sregex.el
+++ b/lisp/obsolete/sregex.el
@@ -338,15 +338,15 @@ computed (i.e., non-constant) values in `sregexq' expressions. So
338automatically quote its values. Literal sregex clauses must be 338automatically quote its values. Literal sregex clauses must be
339explicitly quoted like so: 339explicitly quoted like so:
340 340
341 (sregex '(or \"Bob\" \"Robert\")) => \"Bob\\\\|Robert\" 341 (sregex \\='(or \"Bob\" \"Robert\")) => \"Bob\\\\|Robert\"
342 342
343but computed clauses can be included easily, allowing for the reuse 343but computed clauses can be included easily, allowing for the reuse
344of common clauses: 344of common clauses:
345 345
346 (let ((dotstar '(0+ any)) 346 (let ((dotstar \\='(0+ any))
347 (whitespace '(1+ (syntax ?-))) 347 (whitespace \\='(1+ (syntax ?-)))
348 (digits '(1+ (char (?0 . ?9))))) 348 (digits \\='(1+ (char (?0 . ?9)))))
349 (sregex 'bol dotstar \":\" whitespace digits)) => \"^.*:\\\\s-+[0-9]+\" 349 (sregex \\='bol dotstar \":\" whitespace digits)) => \"^.*:\\\\s-+[0-9]+\"
350 350
351Here are the clauses allowed in an `sregex' or `sregexq' expression: 351Here are the clauses allowed in an `sregex' or `sregexq' expression:
352 352
diff --git a/lisp/obsolete/tpu-edt.el b/lisp/obsolete/tpu-edt.el
index 981426581c2..adf6122f299 100644
--- a/lisp/obsolete/tpu-edt.el
+++ b/lisp/obsolete/tpu-edt.el
@@ -873,7 +873,7 @@ With argument, fill and justify."
873 (set-frame-width (selected-frame) width)) 873 (set-frame-width (selected-frame) width))
874 874
875(defun tpu-toggle-newline-and-indent nil 875(defun tpu-toggle-newline-and-indent nil
876 "Toggle between 'newline and indent' and 'simple newline'." 876 "Toggle between newline and indent and simple newline."
877 (interactive) 877 (interactive)
878 (cond (tpu-newline-and-indent-p 878 (cond (tpu-newline-and-indent-p
879 (setq tpu-newline-and-indent-string "") 879 (setq tpu-newline-and-indent-string "")
@@ -1124,7 +1124,7 @@ if ARG is omitted or nil."
1124 1124
1125 M-x help-for-help <CR> p <CR> 1125 M-x help-for-help <CR> p <CR>
1126 1126
1127 Where `M-x' might be any of `Gold-KP7', 'Do', or 'ESC-x'. 1127 Where `M-x' might be any of `Gold-KP7', `Do', or `ESC-x'.
1128 1128
1129 When you successfully invoke this part of the Emacs help facility, you 1129 When you successfully invoke this part of the Emacs help facility, you
1130 will see a buffer named `*Finder*' listing a number of topics. Look for 1130 will see a buffer named `*Finder*' listing a number of topics. Look for
@@ -1313,7 +1313,7 @@ kill modified buffers without asking."
1313 (if tpu-regexp-p "en" "dis")))) 1313 (if tpu-regexp-p "en" "dis"))))
1314 1314
1315(defun tpu-regexp-prompt (prompt) 1315(defun tpu-regexp-prompt (prompt)
1316 "Read a string, adding 'RE' to the prompt if tpu-regexp-p is set." 1316 "Read a string, adding RE to the prompt if tpu-regexp-p is set."
1317 (let ((re-prompt (concat (if tpu-regexp-p "RE ") prompt))) 1317 (let ((re-prompt (concat (if tpu-regexp-p "RE ") prompt)))
1318 (read-from-minibuffer re-prompt nil nil nil 'tpu-regexp-prompt-hist))) 1318 (read-from-minibuffer re-prompt nil nil nil 'tpu-regexp-prompt-hist)))
1319 1319
diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el
index 8b2454b1ea6..e6540ce74d9 100644
--- a/lisp/obsolete/vc-arch.el
+++ b/lisp/obsolete/vc-arch.el
@@ -315,7 +315,7 @@ Only the value `maybe' can be trusted :-(."
315(declare-function vc-exec-after "vc-dispatcher" (code)) 315(declare-function vc-exec-after "vc-dispatcher" (code))
316 316
317(defun vc-arch-dir-status-files (dir _files callback) 317(defun vc-arch-dir-status-files (dir _files callback)
318 "Run 'tla inventory' for DIR and pass results to CALLBACK. 318 "Run `tla inventory' for DIR and pass results to CALLBACK.
319CALLBACK expects (ENTRIES &optional MORE-TO-COME); see 319CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
320`vc-dir-refresh'." 320`vc-dir-refresh'."
321 (let ((default-directory dir)) 321 (let ((default-directory dir))
diff --git a/lisp/obsolete/vi.el b/lisp/obsolete/vi.el
index 40d2e22eda2..2375eb509be 100644
--- a/lisp/obsolete/vi.el
+++ b/lisp/obsolete/vi.el
@@ -428,16 +428,16 @@ Major differences between this mode and real vi :
428 - Search patterns with line offset (e.g. /pat/+3 or /pat/z.) are 428 - Search patterns with line offset (e.g. /pat/+3 or /pat/z.) are
429 not supported. 429 not supported.
430 - Ex commands are not implemented; try ':' to get some hints. 430 - Ex commands are not implemented; try ':' to get some hints.
431 - No line undo (i.e. the 'U' command), but multi-undo is a standard feature. 431 - No line undo (i.e. the `U' command), but multi-undo is a standard feature.
432 432
433* Modifications 433* Modifications
434 - The stopping positions for some point motion commands (word boundary, 434 - The stopping positions for some point motion commands (word boundary,
435 pattern search) are slightly different from standard 'vi'. 435 pattern search) are slightly different from standard `vi'.
436 Also, no automatic wrap around at end of buffer for pattern searching. 436 Also, no automatic wrap around at end of buffer for pattern searching.
437 - Since changes are done in two steps (deletion then insertion), you need 437 - Since changes are done in two steps (deletion then insertion), you need
438 to undo twice to completely undo a change command. But this is not needed 438 to undo twice to completely undo a change command. But this is not needed
439 for undoing a repeated change command. 439 for undoing a repeated change command.
440 - No need to set/unset 'magic', to search for a string with regular expr 440 - No need to set/unset `magic', to search for a string with regular expr
441 in it just put a prefix arg for the search commands. Replace cmds too. 441 in it just put a prefix arg for the search commands. Replace cmds too.
442 - ^R is bound to incremental backward search, so use ^L to redraw screen. 442 - ^R is bound to incremental backward search, so use ^L to redraw screen.
443 443
@@ -520,7 +520,7 @@ set sw=n M-x set-variable vi-shift-width n "
520(defun vi-goto-insert-state (repetition &optional prefix-code do-it-now-p) 520(defun vi-goto-insert-state (repetition &optional prefix-code do-it-now-p)
521 "Go into insert state, the text entered will be repeated if REPETITION > 1. 521 "Go into insert state, the text entered will be repeated if REPETITION > 1.
522If PREFIX-CODE is given, do it before insertion begins if DO-IT-NOW-P is T. 522If PREFIX-CODE is given, do it before insertion begins if DO-IT-NOW-P is T.
523In any case, the prefix-code will be done before each 'redo-insert'. 523In any case, the prefix-code will be done before each `redo-insert'.
524This function expects `overwrite-mode' being set properly beforehand." 524This function expects `overwrite-mode' being set properly beforehand."
525 (if do-it-now-p (apply (car prefix-code) (cdr prefix-code))) 525 (if do-it-now-p (apply (car prefix-code) (cdr prefix-code)))
526 (setq vi-ins-point (point)) 526 (setq vi-ins-point (point))
@@ -832,7 +832,7 @@ Possible prefix-arg cases are nil, INTEGER, (nil . CHAR) or (INTEGER . CHAR)."
832 832
833(defun vi-goto-mark (mark-char &optional line-flag) 833(defun vi-goto-mark (mark-char &optional line-flag)
834 "Go to marked position or line (if line-flag is given). 834 "Go to marked position or line (if line-flag is given).
835Goto mark '@' means jump into and pop the top mark on the mark ring." 835Goto mark @ means jump into and pop the top mark on the mark ring."
836 (cond ((char-equal mark-char last-command-event) ; `` or '' 836 (cond ((char-equal mark-char last-command-event) ; `` or ''
837 (exchange-point-and-mark) (if line-flag (back-to-indentation))) 837 (exchange-point-and-mark) (if line-flag (back-to-indentation)))
838 ((char-equal mark-char ?@) ; jump and pop mark 838 ((char-equal mark-char ?@) ; jump and pop mark