diff options
| author | John Paul Wallington | 2003-12-23 20:25:22 +0000 |
|---|---|---|
| committer | John Paul Wallington | 2003-12-23 20:25:22 +0000 |
| commit | 1ed6e0c324825e1aff044af6f10b30b4d0e6f3cd (patch) | |
| tree | 363718a567bab7579201d55d68bc0f94d17973d7 | |
| parent | 638411f732491766c8c049e3cac943763e877549 (diff) | |
| download | emacs-1ed6e0c324825e1aff044af6f10b30b4d0e6f3cd.tar.gz emacs-1ed6e0c324825e1aff044af6f10b30b4d0e6f3cd.zip | |
(Info-unescape-quotes, Info-split-parameter-string)
(Info-goto-emacs-command-node): Doc fixes.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/info.el | 21 |
2 files changed, 15 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8b8178dcfbc..6d4177138df 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-12-23 John Paul Wallington <jpw@gnu.org> | ||
| 2 | |||
| 3 | * info.el (Info-unescape-quotes, Info-split-parameter-string) | ||
| 4 | (Info-goto-emacs-command-node): Doc fixes. | ||
| 5 | |||
| 1 | 2003-12-03 Kenichi Handa <handa@m17n.org> | 6 | 2003-12-03 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * language/cyrillic.el: Register "microsoft-cp1251" in | 8 | * language/cyrillic.el: Register "microsoft-cp1251" in |
diff --git a/lisp/info.el b/lisp/info.el index 47af5bb8154..9616dbb1feb 100644 --- a/lisp/info.el +++ b/lisp/info.el | |||
| @@ -1086,7 +1086,7 @@ a case-insensitive match is tried." | |||
| 1086 | (+ (- nodepos lastfilepos) (point))))) | 1086 | (+ (- nodepos lastfilepos) (point))))) |
| 1087 | 1087 | ||
| 1088 | (defun Info-unescape-quotes (value) | 1088 | (defun Info-unescape-quotes (value) |
| 1089 | "Unescape double quotes and backslashes in VALUE" | 1089 | "Unescape double quotes and backslashes in VALUE." |
| 1090 | (let ((start 0) | 1090 | (let ((start 0) |
| 1091 | (unquote value)) | 1091 | (unquote value)) |
| 1092 | (while (string-match "[^\\\"]*\\(\\\\\\)[\\\\\"]" unquote start) | 1092 | (while (string-match "[^\\\"]*\\(\\\\\\)[\\\\\"]" unquote start) |
| @@ -1099,10 +1099,9 @@ a case-insensitive match is tried." | |||
| 1099 | ;; into the Info file for handling images. | 1099 | ;; into the Info file for handling images. |
| 1100 | (defun Info-split-parameter-string (parameter-string) | 1100 | (defun Info-split-parameter-string (parameter-string) |
| 1101 | "Return alist of (\"KEY\" . \"VALUE\") from PARAMETER-STRING; a | 1101 | "Return alist of (\"KEY\" . \"VALUE\") from PARAMETER-STRING; a |
| 1102 | whitespace separated list of KEY=VALUE pairs. If VALUE | 1102 | whitespace separated list of KEY=VALUE pairs. If VALUE contains |
| 1103 | contains whitespace or double quotes, it must be quoted in | 1103 | whitespace or double quotes, it must be quoted in double quotes and |
| 1104 | double quotes and any double quotes or backslashes must be | 1104 | any double quotes or backslashes must be escaped (\\\",\\\\)." |
| 1105 | escaped (\\\",\\\\)." | ||
| 1106 | (let ((start 0) | 1105 | (let ((start 0) |
| 1107 | (parameter-alist)) | 1106 | (parameter-alist)) |
| 1108 | (while (string-match | 1107 | (while (string-match |
| @@ -2683,12 +2682,12 @@ The locations are of the format used in `Info-history', i.e. | |||
| 2683 | "Go to the Info node in the Emacs manual for command COMMAND. | 2682 | "Go to the Info node in the Emacs manual for command COMMAND. |
| 2684 | The command is found by looking up in Emacs manual's indices | 2683 | The command is found by looking up in Emacs manual's indices |
| 2685 | or in another manual found via COMMAND's `info-file' property or | 2684 | or in another manual found via COMMAND's `info-file' property or |
| 2686 | the variable `Info-file-list-for-emacs'. COMMAND must be a symbol | 2685 | the variable `Info-file-list-for-emacs'. |
| 2687 | or string." | 2686 | COMMAND must be a symbol or string." |
| 2688 | (interactive "CFind documentation for command: ") | 2687 | (interactive "CFind documentation for command: ") |
| 2689 | ;; If command is given as a string, convert it to a symbol. | 2688 | ;; If command is given as a string, convert it to a symbol. |
| 2690 | (if (stringp command) | 2689 | (if (stringp command) |
| 2691 | (setq command (intern command))) | 2690 | (setq command (intern command))) |
| 2692 | (or (commandp command) | 2691 | (or (commandp command) |
| 2693 | (signal 'wrong-type-argument (list 'commandp command))) | 2692 | (signal 'wrong-type-argument (list 'commandp command))) |
| 2694 | (let ((where (Info-find-emacs-command-nodes command))) | 2693 | (let ((where (Info-find-emacs-command-nodes command))) |
| @@ -2785,9 +2784,9 @@ Preserve text properties." | |||
| 2785 | (setq mb (match-beginning 0) | 2784 | (setq mb (match-beginning 0) |
| 2786 | me (1+ mb) | 2785 | me (1+ mb) |
| 2787 | m (substring string mb me) | 2786 | m (substring string mb me) |
| 2788 | matches (cons m | 2787 | matches (cons m |
| 2789 | (cons m | 2788 | (cons m |
| 2790 | (cons (substring string start mb) | 2789 | (cons (substring string start mb) |
| 2791 | matches))) | 2790 | matches))) |
| 2792 | start me)) | 2791 | start me)) |
| 2793 | (push (substring string start end) matches) | 2792 | (push (substring string start end) matches) |