diff options
| author | Juanma Barranquero | 2010-01-02 02:05:44 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2010-01-02 02:05:44 +0100 |
| commit | 0472835ff2f73013a9633306bf60faa49cd777ba (patch) | |
| tree | ff0ede67f53f653b2cced21bf79cc30080c144d7 | |
| parent | db4a7382f0ee49338f9c52adb93cd16c4b93dcd3 (diff) | |
| download | emacs-0472835ff2f73013a9633306bf60faa49cd777ba.tar.gz emacs-0472835ff2f73013a9633306bf60faa49cd777ba.zip | |
lisp/*: Fix typos in docstrings and messages.
| -rw-r--r-- | lisp/ChangeLog | 52 | ||||
| -rw-r--r-- | lisp/bookmark.el | 52 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-typecache.el | 4 | ||||
| -rw-r--r-- | lisp/ediff-mult.el | 10 | ||||
| -rw-r--r-- | lisp/mpc.el | 2 | ||||
| -rw-r--r-- | lisp/net/imap-hash.el | 88 | ||||
| -rw-r--r-- | lisp/play/gomoku.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/gdb-ui.el | 26 | ||||
| -rw-r--r-- | lisp/progmodes/idlw-help.el | 55 | ||||
| -rw-r--r-- | lisp/progmodes/octave-mod.el | 6 |
10 files changed, 176 insertions, 123 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 65877141083..5b630124e44 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,55 @@ | |||
| 1 | 2010-01-02 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * bookmark.el (bookmarks-already-loaded): Doc fix (don't use `iff'). | ||
| 4 | (bookmark-yank-point, bookmark-bmenu-check-position): | ||
| 5 | Fix typos in docstrings. | ||
| 6 | (bookmark-save-flag, bookmark-bmenu-toggle-filenames) | ||
| 7 | (bookmark-name-from-full-record, bookmark-get-position) | ||
| 8 | (bookmark-set-position, bookmark-set, bookmark-handle-bookmark) | ||
| 9 | (bookmark-delete, bookmark-save, bookmark-save, bookmark-bmenu-mode): | ||
| 10 | Remove useless quoting of parenthesis, etc. in docstrings. | ||
| 11 | |||
| 12 | * ediff-mult.el (ediff-prepare-meta-buffer): Fix typo in help message. | ||
| 13 | (ediff-append-custom-diff): Fix typo in error message. | ||
| 14 | (ediff-meta-mark-equal-files): Fix typos in messages. | ||
| 15 | |||
| 16 | * mpc.el (mpc-playlist-delete): Fix typo in error messages. | ||
| 17 | |||
| 18 | * cedet/semantic/db-typecache.el (semanticdb-typecache-find-default): | ||
| 19 | Fix typo in docstring. | ||
| 20 | |||
| 21 | * net/imap-hash.el (imap-hash-make): Doc fix. | ||
| 22 | (imap-hash-test): Fix typo in error message; reflow docstring. | ||
| 23 | (imap-hash-p, imap-hash-get, imap-hash-put, imap-hash-make-message) | ||
| 24 | (imap-hash-count, imap-hash-server, imap-hash-port, imap-hash-ssl) | ||
| 25 | (imap-hash-mailbox, imap-hash-user, imap-hash-password): | ||
| 26 | Fix typos in docstrings. | ||
| 27 | (imap-hash-open-connection): Fix typo in error message. | ||
| 28 | |||
| 29 | * play/gomoku.el (gomoku): Fix typos in docstring. | ||
| 30 | |||
| 31 | * progmodes/gdb-ui.el (gdb-location-alist): Reflow docstring. | ||
| 32 | (gdb-jsonify-buffer): Fix typos in docstring. | ||
| 33 | (gdb-goto-breakpoint): Fix typo in error message. | ||
| 34 | ("Display Other Windows"): Fix typo in help message. | ||
| 35 | (gdb-speedbar-expand-node): Fix typo in question. | ||
| 36 | |||
| 37 | * progmodes/idlw-help.el (idlwave-help-browse-url-available) | ||
| 38 | (idlwave-html-system-help-location, idlwave-html-help-location) | ||
| 39 | (idlwave-help-browser-function, idlwave-help-browser-generic-program) | ||
| 40 | (idlwave-help-browser-generic-args, idlwave-help-directory) | ||
| 41 | (idlwave-html-help-is-available, idlwave-help-mode-line-indicator) | ||
| 42 | (idlwave-help-mode-map, idlwave-help-mode, idlwave-do-context-help) | ||
| 43 | (idlwave-online-help, idlwave-help-html-link) | ||
| 44 | (idlwave-help-show-help-frame, idlwave-help-assistant-command): | ||
| 45 | Fix typos in docstrings. | ||
| 46 | (idlwave-help-with-source, idlwave-help-find-routine-definition): | ||
| 47 | Reflow docstrings. | ||
| 48 | (idlwave-help-assistant-start): Fix typo in error message. | ||
| 49 | |||
| 50 | * progmodes/octave-mod.el (octave-mode, octave-electric-semi) | ||
| 51 | (octave-electric-space): Fix typos in docstrings. | ||
| 52 | |||
| 1 | 2010-01-01 Chong Yidong <cyd@stupidchicken.com> | 53 | 2010-01-01 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 54 | ||
| 3 | * files.el (minibuffer-with-setup-hook): Doc fix (Bug#5149). | 55 | * files.el (minibuffer-with-setup-hook): Doc fix (Bug#5149). |
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index 4614eef493d..54a70621cf9 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el | |||
| @@ -107,17 +107,17 @@ | |||
| 107 | (defcustom bookmark-save-flag t | 107 | (defcustom bookmark-save-flag t |
| 108 | "Controls when Emacs saves bookmarks to a file. | 108 | "Controls when Emacs saves bookmarks to a file. |
| 109 | --> nil means never save bookmarks, except when `bookmark-save' is | 109 | --> nil means never save bookmarks, except when `bookmark-save' is |
| 110 | explicitly called \(\\[bookmark-save]\). | 110 | explicitly called (\\[bookmark-save]). |
| 111 | --> t means save bookmarks when Emacs is killed. | 111 | --> t means save bookmarks when Emacs is killed. |
| 112 | --> Otherwise, it should be a number that is the frequency with which | 112 | --> Otherwise, it should be a number that is the frequency with which |
| 113 | the bookmark list is saved \(i.e.: the number of times which | 113 | the bookmark list is saved (i.e.: the number of times which |
| 114 | Emacs' bookmark list may be modified before it is automatically | 114 | Emacs' bookmark list may be modified before it is automatically |
| 115 | saved.\). If it is a number, Emacs will also automatically save | 115 | saved.). If it is a number, Emacs will also automatically save |
| 116 | bookmarks when it is killed. | 116 | bookmarks when it is killed. |
| 117 | 117 | ||
| 118 | Therefore, the way to get it to save every time you make or delete a | 118 | Therefore, the way to get it to save every time you make or delete a |
| 119 | bookmark is to set this variable to 1 \(or 0, which produces the same | 119 | bookmark is to set this variable to 1 (or 0, which produces the same |
| 120 | behavior.\) | 120 | behavior.) |
| 121 | 121 | ||
| 122 | To specify the file in which to save them, modify the variable | 122 | To specify the file in which to save them, modify the variable |
| 123 | `bookmark-default-file', which is `~/.emacs.bmk' by default." | 123 | `bookmark-default-file', which is `~/.emacs.bmk' by default." |
| @@ -186,7 +186,7 @@ You can toggle whether files are shown with \\<bookmark-bmenu-mode-map>\\[bookma | |||
| 186 | This may result in truncated bookmark names. To disable this, put the | 186 | This may result in truncated bookmark names. To disable this, put the |
| 187 | following in your `.emacs' file: | 187 | following in your `.emacs' file: |
| 188 | 188 | ||
| 189 | \(setq bookmark-bmenu-toggle-filenames nil\)" | 189 | \(setq bookmark-bmenu-toggle-filenames nil)" |
| 190 | :type 'boolean | 190 | :type 'boolean |
| 191 | :group 'bookmark) | 191 | :group 'bookmark) |
| 192 | 192 | ||
| @@ -292,7 +292,7 @@ or the deprecated form (BOOKMARK-NAME PARAM-ALIST). | |||
| 292 | for instance. HANDLER must accept a bookmark as argument.") | 292 | for instance. HANDLER must accept a bookmark as argument.") |
| 293 | 293 | ||
| 294 | (defvar bookmarks-already-loaded nil | 294 | (defvar bookmarks-already-loaded nil |
| 295 | "Non-nil iff bookmarks have been loaded from `bookmark-default-file'.") | 295 | "Non-nil if and only if bookmarks have been loaded from `bookmark-default-file'.") |
| 296 | 296 | ||
| 297 | 297 | ||
| 298 | ;; more stuff added by db. | 298 | ;; more stuff added by db. |
| @@ -322,7 +322,7 @@ the source buffer for that information; see `bookmark-yank-word' and | |||
| 322 | 322 | ||
| 323 | (defvar bookmark-yank-point 0 | 323 | (defvar bookmark-yank-point 0 |
| 324 | "The next point from which to pull source text for `bookmark-yank-word'. | 324 | "The next point from which to pull source text for `bookmark-yank-word'. |
| 325 | This point is in `bookmark-curent-buffer'.") | 325 | This point is in `bookmark-current-buffer'.") |
| 326 | 326 | ||
| 327 | 327 | ||
| 328 | (defvar bookmark-quit-flag nil | 328 | (defvar bookmark-quit-flag nil |
| @@ -336,7 +336,7 @@ This point is in `bookmark-curent-buffer'.") | |||
| 336 | 336 | ||
| 337 | 337 | ||
| 338 | (defun bookmark-name-from-full-record (full-record) | 338 | (defun bookmark-name-from-full-record (full-record) |
| 339 | "Return name of FULL-RECORD \(an alist element instead of a string\)." | 339 | "Return name of FULL-RECORD (an alist element instead of a string)." |
| 340 | (car full-record)) | 340 | (car full-record)) |
| 341 | 341 | ||
| 342 | 342 | ||
| @@ -414,13 +414,13 @@ BOOKMARK may be a bookmark name (a string) or a bookmark record." | |||
| 414 | 414 | ||
| 415 | 415 | ||
| 416 | (defun bookmark-get-position (bookmark) | 416 | (defun bookmark-get-position (bookmark) |
| 417 | "Return the position \(i.e.: point\) of BOOKMARK, or nil if none. | 417 | "Return the position (i.e.: point) of BOOKMARK, or nil if none. |
| 418 | BOOKMARK may be a bookmark name (a string) or a bookmark record." | 418 | BOOKMARK may be a bookmark name (a string) or a bookmark record." |
| 419 | (bookmark-prop-get bookmark 'position)) | 419 | (bookmark-prop-get bookmark 'position)) |
| 420 | 420 | ||
| 421 | 421 | ||
| 422 | (defun bookmark-set-position (bookmark position) | 422 | (defun bookmark-set-position (bookmark position) |
| 423 | "Set the position \(i.e.: point\) of BOOKMARK to POSITION. | 423 | "Set the position (i.e.: point) of BOOKMARK to POSITION. |
| 424 | BOOKMARK may be a bookmark name (a string) or a bookmark record." | 424 | BOOKMARK may be a bookmark name (a string) or a bookmark record." |
| 425 | (bookmark-prop-set bookmark 'position position)) | 425 | (bookmark-prop-set bookmark 'position position)) |
| 426 | 426 | ||
| @@ -800,9 +800,9 @@ this helps you use a single bookmark name to track progress through a | |||
| 800 | large document. If there is no prior bookmark for this document, then | 800 | large document. If there is no prior bookmark for this document, then |
| 801 | C-u inserts an appropriate name based on the buffer or file. | 801 | C-u inserts an appropriate name based on the buffer or file. |
| 802 | 802 | ||
| 803 | Use \\[bookmark-delete] to remove bookmarks \(you give it a name and | 803 | Use \\[bookmark-delete] to remove bookmarks (you give it a name and |
| 804 | it removes only the first instance of a bookmark with that name from | 804 | it removes only the first instance of a bookmark with that name from |
| 805 | the list of bookmarks.\)" | 805 | the list of bookmarks.)" |
| 806 | (interactive (list nil current-prefix-arg)) | 806 | (interactive (list nil current-prefix-arg)) |
| 807 | (let* ((record (bookmark-make-record)) | 807 | (let* ((record (bookmark-make-record)) |
| 808 | (default (car record))) | 808 | (default (car record))) |
| @@ -953,7 +953,7 @@ If the buffer is associated with a file or directory, use that name." | |||
| 953 | (defun bookmark-yank-word () | 953 | (defun bookmark-yank-word () |
| 954 | "Get the next word from buffer `bookmark-current-buffer' and append | 954 | "Get the next word from buffer `bookmark-current-buffer' and append |
| 955 | it to the name of the bookmark currently being set, advancing | 955 | it to the name of the bookmark currently being set, advancing |
| 956 | `bookmark-yank-point' by one word." | 956 | `bookmark-yank-point' by one word." |
| 957 | (interactive) | 957 | (interactive) |
| 958 | (let ((string (with-current-buffer bookmark-current-buffer | 958 | (let ((string (with-current-buffer bookmark-current-buffer |
| 959 | (goto-char bookmark-yank-point) | 959 | (goto-char bookmark-yank-point) |
| @@ -1125,7 +1125,7 @@ that file no longer exists, then offer interactively to relocate BOOKMARK." | |||
| 1125 | 'bookmark-default-handler) | 1125 | 'bookmark-default-handler) |
| 1126 | (bookmark-get-bookmark bookmark))) | 1126 | (bookmark-get-bookmark bookmark))) |
| 1127 | (message | 1127 | (message |
| 1128 | "Bookmark not relocated; consider removing it \(%s\)." | 1128 | "Bookmark not relocated; consider removing it (%s)." |
| 1129 | bookmark) | 1129 | bookmark) |
| 1130 | (signal (car err) (cdr err)))))))))) | 1130 | (signal (car err) (cdr err)))))))))) |
| 1131 | ;; Added by db. | 1131 | ;; Added by db. |
| @@ -1248,7 +1248,7 @@ name." | |||
| 1248 | "New name: " | 1248 | "New name: " |
| 1249 | nil | 1249 | nil |
| 1250 | (let ((now-map (copy-keymap minibuffer-local-map))) | 1250 | (let ((now-map (copy-keymap minibuffer-local-map))) |
| 1251 | (define-key now-map "\C-w" 'bookmark-yank-word) | 1251 | (define-key now-map "\C-w" 'bookmark-yank-word) |
| 1252 | now-map) | 1252 | now-map) |
| 1253 | nil | 1253 | nil |
| 1254 | 'bookmark-history)))) | 1254 | 'bookmark-history)))) |
| @@ -1290,8 +1290,8 @@ BOOKMARK is a bookmark name (a string), not a bookmark record. | |||
| 1290 | 1290 | ||
| 1291 | Removes only the first instance of a bookmark with that name. If | 1291 | Removes only the first instance of a bookmark with that name. If |
| 1292 | there are one or more other bookmarks with the same name, they will | 1292 | there are one or more other bookmarks with the same name, they will |
| 1293 | not be deleted. Defaults to the \"current\" bookmark \(that is, the | 1293 | not be deleted. Defaults to the \"current\" bookmark (that is, the |
| 1294 | one most recently used in this file, if any\). | 1294 | one most recently used in this file, if any). |
| 1295 | Optional second arg BATCH means don't update the bookmark list buffer, | 1295 | Optional second arg BATCH means don't update the bookmark list buffer, |
| 1296 | probably because we were called from there." | 1296 | probably because we were called from there." |
| 1297 | (interactive | 1297 | (interactive |
| @@ -1342,7 +1342,7 @@ Don't use this in Lisp programs; use `bookmark-save' instead." | |||
| 1342 | "Save currently defined bookmarks. | 1342 | "Save currently defined bookmarks. |
| 1343 | Saves by default in the file defined by the variable | 1343 | Saves by default in the file defined by the variable |
| 1344 | `bookmark-default-file'. With a prefix arg, save it in file FILE | 1344 | `bookmark-default-file'. With a prefix arg, save it in file FILE |
| 1345 | \(second argument\). | 1345 | \(second argument). |
| 1346 | 1346 | ||
| 1347 | If you are calling this from Lisp, the two arguments are PARG and | 1347 | If you are calling this from Lisp, the two arguments are PARG and |
| 1348 | FILE, and if you just want it to write to the default file, then | 1348 | FILE, and if you just want it to write to the default file, then |
| @@ -1351,7 +1351,7 @@ instead. If you pass in one argument, and it is non-nil, then the | |||
| 1351 | user will be interactively queried for a file to save in. | 1351 | user will be interactively queried for a file to save in. |
| 1352 | 1352 | ||
| 1353 | When you want to load in the bookmarks from a file, use | 1353 | When you want to load in the bookmarks from a file, use |
| 1354 | \`bookmark-load\', \\[bookmark-load]. That function will prompt you | 1354 | `bookmark-load', \\[bookmark-load]. That function will prompt you |
| 1355 | for a file, defaulting to the file defined by variable | 1355 | for a file, defaulting to the file defined by variable |
| 1356 | `bookmark-default-file'." | 1356 | `bookmark-default-file'." |
| 1357 | (interactive "P") | 1357 | (interactive "P") |
| @@ -1389,7 +1389,7 @@ for a file, defaulting to the file defined by variable | |||
| 1389 | ;; Rather than a single call to `pp' we make one per bookmark. | 1389 | ;; Rather than a single call to `pp' we make one per bookmark. |
| 1390 | ;; Apparently `pp' has a poor algorithmic complexity, so this | 1390 | ;; Apparently `pp' has a poor algorithmic complexity, so this |
| 1391 | ;; scales a lot better. bug#4485. | 1391 | ;; scales a lot better. bug#4485. |
| 1392 | (dolist (i bookmark-alist) (pp i (current-buffer))) | 1392 | (dolist (i bookmark-alist) (pp i (current-buffer))) |
| 1393 | (insert ")") | 1393 | (insert ")") |
| 1394 | (let ((version-control | 1394 | (let ((version-control |
| 1395 | (cond | 1395 | (cond |
| @@ -1625,8 +1625,8 @@ Bookmark names preceded by a \"*\" have annotations. | |||
| 1625 | \\[bookmark-bmenu-other-window] -- select this bookmark in another window, | 1625 | \\[bookmark-bmenu-other-window] -- select this bookmark in another window, |
| 1626 | so the bookmark menu bookmark remains visible in its window. | 1626 | so the bookmark menu bookmark remains visible in its window. |
| 1627 | \\[bookmark-bmenu-switch-other-window] -- switch the other window to this bookmark. | 1627 | \\[bookmark-bmenu-switch-other-window] -- switch the other window to this bookmark. |
| 1628 | \\[bookmark-bmenu-rename] -- rename this bookmark \(prompts for new name\). | 1628 | \\[bookmark-bmenu-rename] -- rename this bookmark (prompts for new name). |
| 1629 | \\[bookmark-bmenu-relocate] -- relocate this bookmark's file \(prompts for new file\). | 1629 | \\[bookmark-bmenu-relocate] -- relocate this bookmark's file (prompts for new file). |
| 1630 | \\[bookmark-bmenu-delete] -- mark this bookmark to be deleted, and move down. | 1630 | \\[bookmark-bmenu-delete] -- mark this bookmark to be deleted, and move down. |
| 1631 | \\[bookmark-bmenu-delete-backwards] -- mark this bookmark to be deleted, and move up. | 1631 | \\[bookmark-bmenu-delete-backwards] -- mark this bookmark to be deleted, and move up. |
| 1632 | \\[bookmark-bmenu-execute-deletions] -- delete bookmarks marked with `\\[bookmark-bmenu-delete]'. | 1632 | \\[bookmark-bmenu-execute-deletions] -- delete bookmarks marked with `\\[bookmark-bmenu-delete]'. |
| @@ -1731,7 +1731,7 @@ mainly for debugging, and should not be necessary in normal use." | |||
| 1731 | "If point is not on a bookmark line, move it to one. | 1731 | "If point is not on a bookmark line, move it to one. |
| 1732 | If before the first bookmark line, move it to the first. | 1732 | If before the first bookmark line, move it to the first. |
| 1733 | If after the last, move it to the last. | 1733 | If after the last, move it to the last. |
| 1734 | Return `bookmark-alist'" | 1734 | Return `bookmark-alist'." |
| 1735 | ;; FIXME: The doc string originally implied that this returns nil if | 1735 | ;; FIXME: The doc string originally implied that this returns nil if |
| 1736 | ;; not on a bookmark, which is false. Is there any real reason to | 1736 | ;; not on a bookmark, which is false. Is there any real reason to |
| 1737 | ;; return `bookmark-alist'? This seems to be called in a few places | 1737 | ;; return `bookmark-alist'? This seems to be called in a few places |
| @@ -2101,7 +2101,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\ | |||
| 2101 | (when bookmark-quit-flag ; C-g hit restore menu list. | 2101 | (when bookmark-quit-flag ; C-g hit restore menu list. |
| 2102 | (bookmark-bmenu-list) (bookmark-bmenu-goto-bookmark bmk)) | 2102 | (bookmark-bmenu-list) (bookmark-bmenu-goto-bookmark bmk)) |
| 2103 | (setq bookmark-quit-flag nil)))) | 2103 | (setq bookmark-quit-flag nil)))) |
| 2104 | 2104 | ||
| 2105 | (defun bookmark-bmenu-goto-bookmark (name) | 2105 | (defun bookmark-bmenu-goto-bookmark (name) |
| 2106 | "Move point to bookmark with name NAME." | 2106 | "Move point to bookmark with name NAME." |
| 2107 | (goto-char (point-min)) | 2107 | (goto-char (point-min)) |
| @@ -2109,7 +2109,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\ | |||
| 2109 | (while (not (equal name (bookmark-bmenu-bookmark))) | 2109 | (while (not (equal name (bookmark-bmenu-bookmark))) |
| 2110 | (forward-line 1)) | 2110 | (forward-line 1)) |
| 2111 | (forward-line 0)) | 2111 | (forward-line 0)) |
| 2112 | 2112 | ||
| 2113 | 2113 | ||
| 2114 | 2114 | ||
| 2115 | ;;; Menu bar stuff. Prefix is "bookmark-menu". | 2115 | ;;; Menu bar stuff. Prefix is "bookmark-menu". |
diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index 25e253351fa..f89ad4c83d1 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el | |||
| @@ -111,7 +111,7 @@ Said object must support `semantic-reset' methods.") | |||
| 111 | ) | 111 | ) |
| 112 | (object-add-to-list cache 'dependants dep))) | 112 | (object-add-to-list cache 'dependants dep))) |
| 113 | 113 | ||
| 114 | (defun semanticdb-typecache-length(thing) | 114 | (defun semanticdb-typecache-length (thing) |
| 115 | "How long is THING? | 115 | "How long is THING? |
| 116 | Debugging function." | 116 | Debugging function." |
| 117 | (cond ((semanticdb-typecache-child-p thing) | 117 | (cond ((semanticdb-typecache-child-p thing) |
| @@ -383,7 +383,7 @@ FIND-FILE-MATCH is non-nil to force all found tags to be loaded into a buffer.") | |||
| 383 | (defun semanticdb-typecache-find-default (type &optional path find-file-match) | 383 | (defun semanticdb-typecache-find-default (type &optional path find-file-match) |
| 384 | "Default implementation of `semanticdb-typecache-find'. | 384 | "Default implementation of `semanticdb-typecache-find'. |
| 385 | TYPE is the datatype to find. | 385 | TYPE is the datatype to find. |
| 386 | PATH is the search path.. which should be one table object. | 386 | PATH is the search path, which should be one table object. |
| 387 | If FIND-FILE-MATCH is non-nil, then force the file belonging to the | 387 | If FIND-FILE-MATCH is non-nil, then force the file belonging to the |
| 388 | found tag to be loaded." | 388 | found tag to be loaded." |
| 389 | (semanticdb-typecache-find-method (or path semanticdb-current-table) | 389 | (semanticdb-typecache-find-method (or path semanticdb-current-table) |
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index a00ff7e9740..28ee5582bb1 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el | |||
| @@ -330,7 +330,7 @@ buffers." | |||
| 330 | ;; This nil is a placeholder for eq-indicator. It is either nil or =. | 330 | ;; This nil is a placeholder for eq-indicator. It is either nil or =. |
| 331 | ;; If it is discovered that this file is = to some other | 331 | ;; If it is discovered that this file is = to some other |
| 332 | ;; file in the same session, eq-indicator is changed to `='. | 332 | ;; file in the same session, eq-indicator is changed to `='. |
| 333 | ;; Curently, the eq-indicator is used only for 2 and 3-file jobs. | 333 | ;; Currently, the eq-indicator is used only for 2 and 3-file jobs. |
| 334 | (defun ediff-make-new-meta-list-element (obj1 obj2 obj3) | 334 | (defun ediff-make-new-meta-list-element (obj1 obj2 obj3) |
| 335 | (list nil nil (list obj1 nil) (list obj2 nil) (list obj3 nil))) | 335 | (list nil nil (list obj1 nil) (list obj2 nil) (list obj3 nil))) |
| 336 | 336 | ||
| @@ -879,7 +879,7 @@ behavior." | |||
| 879 | (define-key ediff-meta-buffer-map | 879 | (define-key ediff-meta-buffer-map |
| 880 | [menu-bar ediff-meta-mode ediff-mark-for-operation-at-pos] | 880 | [menu-bar ediff-meta-mode ediff-mark-for-operation-at-pos] |
| 881 | '(menu-item "Mark for group operation" ediff-mark-for-operation-at-pos | 881 | '(menu-item "Mark for group operation" ediff-mark-for-operation-at-pos |
| 882 | :help "Mark session for a group operation. With prefix arg, unmark.")) | 882 | :help "Mark session for a group operation. With prefix arg, unmark")) |
| 883 | 883 | ||
| 884 | (define-key ediff-meta-buffer-map | 884 | (define-key ediff-meta-buffer-map |
| 885 | [menu-bar ediff-meta-mode ediff-unmark-all-for-hiding] | 885 | [menu-bar ediff-meta-mode ediff-unmark-all-for-hiding] |
| @@ -1739,7 +1739,7 @@ Useful commands: | |||
| 1739 | (insert "\n"))) | 1739 | (insert "\n"))) |
| 1740 | (t | 1740 | (t |
| 1741 | (ediff-kill-buffer-carefully meta-diff-buff) | 1741 | (ediff-kill-buffer-carefully meta-diff-buff) |
| 1742 | (error "Session %d compares versions of file. Such session must be active to enable multifile patch collection" sessionNum ))) | 1742 | (error "Session %d compares versions of file. Such session must be active to enable multifile patch collection" sessionNum ))) |
| 1743 | )) | 1743 | )) |
| 1744 | 1744 | ||
| 1745 | (defun ediff-collect-custom-diffs () | 1745 | (defun ediff-collect-custom-diffs () |
| @@ -2421,7 +2421,7 @@ for operation, or simply indicate which are equal files. If it is nil, then | |||
| 2421 | (let ((list (cdr ediff-meta-list)) | 2421 | (let ((list (cdr ediff-meta-list)) |
| 2422 | marked1 marked2 marked3 | 2422 | marked1 marked2 marked3 |
| 2423 | fileinfo1 fileinfo2 fileinfo3 elt) | 2423 | fileinfo1 fileinfo2 fileinfo3 elt) |
| 2424 | (message "Comparing files ...") | 2424 | (message "Comparing files...") |
| 2425 | (while (setq elt (car list)) | 2425 | (while (setq elt (car list)) |
| 2426 | (setq fileinfo1 (ediff-get-session-objA elt) | 2426 | (setq fileinfo1 (ediff-get-session-objA elt) |
| 2427 | fileinfo2 (ediff-get-session-objB elt) | 2427 | fileinfo2 (ediff-get-session-objB elt) |
| @@ -2448,7 +2448,7 @@ for operation, or simply indicate which are equal files. If it is nil, then | |||
| 2448 | (ediff-mark-session-for-operation elt 'mark)) | 2448 | (ediff-mark-session-for-operation elt 'mark)) |
| 2449 | )) | 2449 | )) |
| 2450 | (setq list (cdr list))) | 2450 | (setq list (cdr list))) |
| 2451 | (message "Comparing files ... Done")) | 2451 | (message "Comparing files... Done")) |
| 2452 | (setq ediff-recurse-to-subdirectories nil) | 2452 | (setq ediff-recurse-to-subdirectories nil) |
| 2453 | (ediff-update-meta-buffer (current-buffer) 'must-redraw)) | 2453 | (ediff-update-meta-buffer (current-buffer) 'must-redraw)) |
| 2454 | 2454 | ||
diff --git a/lisp/mpc.el b/lisp/mpc.el index b099d039ebb..6b290704622 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el | |||
| @@ -1728,7 +1728,7 @@ A value of t means the main playlist.") | |||
| 1728 | "Remove the selected songs from the playlist." | 1728 | "Remove the selected songs from the playlist." |
| 1729 | (interactive) | 1729 | (interactive) |
| 1730 | (unless mpc-songs-playlist | 1730 | (unless mpc-songs-playlist |
| 1731 | (error "The selected songs aren't part of a playlist.")) | 1731 | (error "The selected songs aren't part of a playlist")) |
| 1732 | (let ((song-poss (mapcar #'cdr (mpc-songs-selection)))) | 1732 | (let ((song-poss (mapcar #'cdr (mpc-songs-selection)))) |
| 1733 | (mpc-cmd-delete song-poss mpc-songs-playlist) | 1733 | (mpc-cmd-delete song-poss mpc-songs-playlist) |
| 1734 | (mpc-songs-refresh) | 1734 | (mpc-songs-refresh) |
diff --git a/lisp/net/imap-hash.el b/lisp/net/imap-hash.el index 47ed4f33914..b0ee31f8fe8 100644 --- a/lisp/net/imap-hash.el +++ b/lisp/net/imap-hash.el | |||
| @@ -67,16 +67,16 @@ | |||
| 67 | (imap-hash-remove-cr-followed-by-lf)))) | 67 | (imap-hash-remove-cr-followed-by-lf)))) |
| 68 | 68 | ||
| 69 | (defun imap-hash-make (server port mailbox &optional user password ssl) | 69 | (defun imap-hash-make (server port mailbox &optional user password ssl) |
| 70 | "Makes a new imap-hash object using SERVER, PORT, and MAILBOX. | 70 | "Make a new imap-hash object using SERVER, PORT, and MAILBOX. |
| 71 | SSL, USER, PASSWORD are optional. | 71 | USER, PASSWORD and SSL are optional. |
| 72 | The test is set to t, meaning all messages are considered." | 72 | The test is set to t, meaning all messages are considered." |
| 73 | (when (and server port mailbox) | 73 | (when (and server port mailbox) |
| 74 | (list :server server :port port :mailbox mailbox | 74 | (list :server server :port port :mailbox mailbox |
| 75 | :ssl ssl :user user :password password | 75 | :ssl ssl :user user :password password |
| 76 | :test t))) | 76 | :test t))) |
| 77 | 77 | ||
| 78 | (defun imap-hash-p (iht) | 78 | (defun imap-hash-p (iht) |
| 79 | "Checks whether IHT is a valid imap-hash." | 79 | "Check whether IHT is a valid imap-hash." |
| 80 | (and | 80 | (and |
| 81 | (imap-hash-server iht) | 81 | (imap-hash-server iht) |
| 82 | (imap-hash-port iht) | 82 | (imap-hash-port iht) |
| @@ -95,7 +95,7 @@ The test is set to t, meaning all messages are considered." | |||
| 95 | (defun imap-hash-get (key iht &optional refetch) | 95 | (defun imap-hash-get (key iht &optional refetch) |
| 96 | "Get the value for KEY in the imap-hash IHT. | 96 | "Get the value for KEY in the imap-hash IHT. |
| 97 | Requires either `imap-hash-fetch' to be called beforehand | 97 | Requires either `imap-hash-fetch' to be called beforehand |
| 98 | (e.g. by `imap-hash-map'), or REFETCH to be t. | 98 | \(e.g. by `imap-hash-map'), or REFETCH to be t. |
| 99 | Returns a list of the headers (an alist, see `imap-hash-map') and | 99 | Returns a list of the headers (an alist, see `imap-hash-map') and |
| 100 | the body of the message as a string. | 100 | the body of the message as a string. |
| 101 | Also see `imap-hash-test'." | 101 | Also see `imap-hash-test'." |
| @@ -106,13 +106,13 @@ Also see `imap-hash-test'." | |||
| 106 | (list | 106 | (list |
| 107 | (imap-hash-get-headers | 107 | (imap-hash-get-headers |
| 108 | (imap-hash-data-headers details)) | 108 | (imap-hash-data-headers details)) |
| 109 | (imap-hash-get-body | 109 | (imap-hash-get-body |
| 110 | (imap-hash-data-body details)))))) | 110 | (imap-hash-data-body details)))))) |
| 111 | 111 | ||
| 112 | (defun imap-hash-put (value iht &optional key) | 112 | (defun imap-hash-put (value iht &optional key) |
| 113 | "Put VALUE in the imap-hash IHT. Returns the new key. | 113 | "Put VALUE in the imap-hash IHT. Return the new key. |
| 114 | If KEY is given, removes it. | 114 | If KEY is given, removes it. |
| 115 | VALUE can be a list of the headers (an alist, see `imap-hash-map') | 115 | VALUE can be a list of the headers (an alist, see `imap-hash-map') |
| 116 | and the body of the message as a string. It can also be a uid, | 116 | and the body of the message as a string. It can also be a uid, |
| 117 | in which case `imap-hash-get' will be called to get the value. | 117 | in which case `imap-hash-get' will be called to get the value. |
| 118 | Also see `imap-hash-test'." | 118 | Also see `imap-hash-test'." |
| @@ -121,19 +121,19 @@ Also see `imap-hash-test'." | |||
| 121 | newuid) | 121 | newuid) |
| 122 | (when value | 122 | (when value |
| 123 | (with-temp-buffer | 123 | (with-temp-buffer |
| 124 | (funcall 'imap-hash-make-message | 124 | (funcall 'imap-hash-make-message |
| 125 | (nth 0 value) | 125 | (nth 0 value) |
| 126 | (nth 1 value) | 126 | (nth 1 value) |
| 127 | nil) | 127 | nil) |
| 128 | (setq newuid (nth 1 (imap-message-append | 128 | (setq newuid (nth 1 (imap-message-append |
| 129 | (imap-hash-mailbox iht) | 129 | (imap-hash-mailbox iht) |
| 130 | (current-buffer) nil nil server-buffer))) | 130 | (current-buffer) nil nil server-buffer))) |
| 131 | (when key (imap-hash-rem key iht)))) | 131 | (when key (imap-hash-rem key iht)))) |
| 132 | newuid)) | 132 | newuid)) |
| 133 | 133 | ||
| 134 | (defun imap-hash-make-message (headers body &optional overrides) | 134 | (defun imap-hash-make-message (headers body &optional overrides) |
| 135 | "Make a message with HEADERS and BODY suitable for `imap-append', | 135 | "Make a message with HEADERS and BODY suitable for `imap-append', |
| 136 | using `message-setup'.. | 136 | using `message-setup'. |
| 137 | Look in the alist OVERRIDES for header overrides as per `imap-hash-headers'." | 137 | Look in the alist OVERRIDES for header overrides as per `imap-hash-headers'." |
| 138 | ;; don't insert a signature no matter what | 138 | ;; don't insert a signature no matter what |
| 139 | (let (message-signature) | 139 | (let (message-signature) |
| @@ -154,7 +154,7 @@ Look in the alist OVERRIDES for header overrides as per `imap-hash-headers'." | |||
| 154 | (defun imap-hash-rem (key iht) | 154 | (defun imap-hash-rem (key iht) |
| 155 | "Remove KEY in the imap-hash IHT. | 155 | "Remove KEY in the imap-hash IHT. |
| 156 | Also see `imap-hash-test'. Requires `imap-hash-fetch' to have | 156 | Also see `imap-hash-test'. Requires `imap-hash-fetch' to have |
| 157 | been called and the imap-hash server buffer to be current, | 157 | been called and the imap-hash server buffer to be current, |
| 158 | so it's best to use it inside `imap-hash-map'. | 158 | so it's best to use it inside `imap-hash-map'. |
| 159 | The key will not be found on the next `imap-hash-map' call." | 159 | The key will not be found on the next `imap-hash-map' call." |
| 160 | (with-current-buffer (imap-hash-get-buffer iht) | 160 | (with-current-buffer (imap-hash-get-buffer iht) |
| @@ -172,7 +172,7 @@ Also see `imap-hash-test'." | |||
| 172 | (with-temp-buffer | 172 | (with-temp-buffer |
| 173 | (insert (or text-headers "")) | 173 | (insert (or text-headers "")) |
| 174 | (imap-hash-remove-cr-followed-by-lf) | 174 | (imap-hash-remove-cr-followed-by-lf) |
| 175 | (mapcar (lambda (header) | 175 | (mapcar (lambda (header) |
| 176 | (cons header | 176 | (cons header |
| 177 | (message-fetch-field (format "%s" header)))) | 177 | (message-fetch-field (format "%s" header)))) |
| 178 | imap-hash-headers))) | 178 | imap-hash-headers))) |
| @@ -199,11 +199,11 @@ Also see `imap-hash-test'." | |||
| 199 | (headers (imap-hash-data-headers details)) | 199 | (headers (imap-hash-data-headers details)) |
| 200 | (hlist (imap-hash-get-headers headers)) | 200 | (hlist (imap-hash-get-headers headers)) |
| 201 | (runit (cond | 201 | (runit (cond |
| 202 | ((stringp test) | 202 | ((stringp test) |
| 203 | (string-match | 203 | (string-match |
| 204 | test | 204 | test |
| 205 | (format "%s" (aget hlist 'Subject)))) | 205 | (format "%s" (aget hlist 'Subject)))) |
| 206 | ((functionp test) | 206 | ((functionp test) |
| 207 | (funcall test hlist)) | 207 | (funcall test hlist)) |
| 208 | ;; otherwise, return test itself | 208 | ;; otherwise, return test itself |
| 209 | (t test)))) | 209 | (t test)))) |
| @@ -218,7 +218,7 @@ Also see `imap-hash-test'." | |||
| 218 | "UID"))))) | 218 | "UID"))))) |
| 219 | 219 | ||
| 220 | (defun imap-hash-count (iht) | 220 | (defun imap-hash-count (iht) |
| 221 | "Counts the number of messages in the imap-hash IHT. | 221 | "Count the number of messages in the imap-hash IHT. |
| 222 | Also see `imap-hash-test'. It uses `imap-hash-map' so just use that | 222 | Also see `imap-hash-test'. It uses `imap-hash-map' so just use that |
| 223 | function if you want to do more than count the elements." | 223 | function if you want to do more than count the elements." |
| 224 | (length (imap-hash-map (lambda (a b c)) iht t))) | 224 | (length (imap-hash-map (lambda (a b c)) iht t))) |
| @@ -226,36 +226,36 @@ function if you want to do more than count the elements." | |||
| 226 | (defalias 'imap-hash-size 'imap-hash-count) | 226 | (defalias 'imap-hash-size 'imap-hash-count) |
| 227 | 227 | ||
| 228 | (defun imap-hash-test (iht) | 228 | (defun imap-hash-test (iht) |
| 229 | "Returns the test used by `imap-hash-map' for IHT. | 229 | "Return the test used by `imap-hash-map' for IHT. |
| 230 | When the test is t, any key will be a candidate. | 230 | When the test is t, any key will be a candidate. |
| 231 | When the test is a string, messages will be filtered on that string as a regexp | 231 | When the test is a string, messages will be filtered on that string as a |
| 232 | against the subject. | 232 | regexp against the subject. |
| 233 | When the test is a function, messages will be filtered with it. | 233 | When the test is a function, messages will be filtered with it. |
| 234 | The function is passed the message headers (see `imap-hash-get-headers')." | 234 | The function is passed the message headers (see `imap-hash-get-headers')." |
| 235 | (plist-get iht :test)) | 235 | (plist-get iht :test)) |
| 236 | 236 | ||
| 237 | (defun imap-hash-server (iht) | 237 | (defun imap-hash-server (iht) |
| 238 | "Returns the server used by the imap-hash IHT." | 238 | "Return the server used by the imap-hash IHT." |
| 239 | (plist-get iht :server)) | 239 | (plist-get iht :server)) |
| 240 | 240 | ||
| 241 | (defun imap-hash-port (iht) | 241 | (defun imap-hash-port (iht) |
| 242 | "Returns the port used by the imap-hash IHT." | 242 | "Return the port used by the imap-hash IHT." |
| 243 | (plist-get iht :port)) | 243 | (plist-get iht :port)) |
| 244 | 244 | ||
| 245 | (defun imap-hash-ssl (iht) | 245 | (defun imap-hash-ssl (iht) |
| 246 | "Returns the SSL need for the imap-hash IHT." | 246 | "Return the SSL need for the imap-hash IHT." |
| 247 | (plist-get iht :ssl)) | 247 | (plist-get iht :ssl)) |
| 248 | 248 | ||
| 249 | (defun imap-hash-mailbox (iht) | 249 | (defun imap-hash-mailbox (iht) |
| 250 | "Returns the mailbox used by the imap-hash IHT." | 250 | "Return the mailbox used by the imap-hash IHT." |
| 251 | (plist-get iht :mailbox)) | 251 | (plist-get iht :mailbox)) |
| 252 | 252 | ||
| 253 | (defun imap-hash-user (iht) | 253 | (defun imap-hash-user (iht) |
| 254 | "Returns the username used by the imap-hash IHT." | 254 | "Return the username used by the imap-hash IHT." |
| 255 | (plist-get iht :user)) | 255 | (plist-get iht :user)) |
| 256 | 256 | ||
| 257 | (defun imap-hash-password (iht) | 257 | (defun imap-hash-password (iht) |
| 258 | "Returns the password used by the imap-hash IHT." | 258 | "Return the password used by the imap-hash IHT." |
| 259 | (plist-get iht :password)) | 259 | (plist-get iht :password)) |
| 260 | 260 | ||
| 261 | (defun imap-hash-open-connection (iht) | 261 | (defun imap-hash-open-connection (iht) |
| @@ -263,16 +263,16 @@ The function is passed the message headers (see `imap-hash-get-headers')." | |||
| 263 | (let* ((server (imap-hash-server iht)) | 263 | (let* ((server (imap-hash-server iht)) |
| 264 | (port (imap-hash-port iht)) | 264 | (port (imap-hash-port iht)) |
| 265 | (ssl-need (imap-hash-ssl iht)) | 265 | (ssl-need (imap-hash-ssl iht)) |
| 266 | (auth-need (not (and (imap-hash-user iht) | 266 | (auth-need (not (and (imap-hash-user iht) |
| 267 | (imap-hash-password iht)))) | 267 | (imap-hash-password iht)))) |
| 268 | ;; this will not be needed if auth-need is t | 268 | ;; this will not be needed if auth-need is t |
| 269 | (auth-info (when auth-need | 269 | (auth-info (when auth-need |
| 270 | (auth-source-user-or-password | 270 | (auth-source-user-or-password |
| 271 | '("login" "password") | 271 | '("login" "password") |
| 272 | server port))) | 272 | server port))) |
| 273 | (auth-user (or (imap-hash-user iht) | 273 | (auth-user (or (imap-hash-user iht) |
| 274 | (nth 0 auth-info))) | 274 | (nth 0 auth-info))) |
| 275 | (auth-passwd (or (imap-hash-password iht) | 275 | (auth-passwd (or (imap-hash-password iht) |
| 276 | (nth 1 auth-info))) | 276 | (nth 1 auth-info))) |
| 277 | (imap-logout-timeout nil)) | 277 | (imap-logout-timeout nil)) |
| 278 | 278 | ||
| @@ -283,7 +283,7 @@ The function is passed the message headers (see `imap-hash-get-headers')." | |||
| 283 | ;; (debug "after opening server: opened+state" (imap-opened (current-buffer)) imap-state) | 283 | ;; (debug "after opening server: opened+state" (imap-opened (current-buffer)) imap-state) |
| 284 | ;; (debug "authenticating" auth-user auth-passwd) | 284 | ;; (debug "authenticating" auth-user auth-passwd) |
| 285 | (if (not (imap-capability 'IMAP4rev1)) | 285 | (if (not (imap-capability 'IMAP4rev1)) |
| 286 | (error "IMAP server does not support IMAP4r1, it won't work, sorry.") | 286 | (error "IMAP server does not support IMAP4r1, it won't work, sorry") |
| 287 | (imap-authenticate auth-user auth-passwd) | 287 | (imap-authenticate auth-user auth-passwd) |
| 288 | (imap-id) | 288 | (imap-id) |
| 289 | ;; (debug "after authenticating: opened+state" (imap-opened (current-buffer)) imap-state) | 289 | ;; (debug "after authenticating: opened+state" (imap-opened (current-buffer)) imap-state) |
| @@ -314,8 +314,8 @@ The function is passed the message headers (see `imap-hash-get-headers')." | |||
| 314 | "Fetch all the messages for imap-hash IHT. | 314 | "Fetch all the messages for imap-hash IHT. |
| 315 | Get only the headers if HEADERS-ONLY is not nil." | 315 | Get only the headers if HEADERS-ONLY is not nil." |
| 316 | (with-current-buffer (imap-hash-get-buffer iht) | 316 | (with-current-buffer (imap-hash-get-buffer iht) |
| 317 | (let ((range (if messages | 317 | (let ((range (if messages |
| 318 | (list | 318 | (list |
| 319 | (imap-range-to-message-set messages) | 319 | (imap-range-to-message-set messages) |
| 320 | (imap-range-to-message-set messages)) | 320 | (imap-range-to-message-set messages)) |
| 321 | '("1:*" . "1,*:*")))) | 321 | '("1:*" . "1,*:*")))) |
| @@ -329,9 +329,9 @@ Get only the headers if HEADERS-ONLY is not nil." | |||
| 329 | (imap-fetch-safe range | 329 | (imap-fetch-safe range |
| 330 | (concat (format "(UID RFC822.SIZE BODY %s " | 330 | (concat (format "(UID RFC822.SIZE BODY %s " |
| 331 | (if headers-only "" "BODY.PEEK[TEXT]")) | 331 | (if headers-only "" "BODY.PEEK[TEXT]")) |
| 332 | (format "BODY.PEEK[HEADER.FIELDS %s])" | 332 | (format "BODY.PEEK[HEADER.FIELDS %s])" |
| 333 | imap-hash-headers)))))) | 333 | imap-hash-headers)))))) |
| 334 | 334 | ||
| 335 | (provide 'imap-hash) | 335 | (provide 'imap-hash) |
| 336 | ;;; imap-hash.el ends here | 336 | ;;; imap-hash.el ends here |
| 337 | 337 | ||
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el index 19e1a925d51..520f6c151da 100644 --- a/lisp/play/gomoku.el +++ b/lisp/play/gomoku.el | |||
| @@ -730,12 +730,12 @@ that DVAL has been added on SQUARE." | |||
| 730 | (defun gomoku (&optional n m) | 730 | (defun gomoku (&optional n m) |
| 731 | "Start a Gomoku game between you and Emacs. | 731 | "Start a Gomoku game between you and Emacs. |
| 732 | 732 | ||
| 733 | If a game is in progress, this command allow you to resume it. | 733 | If a game is in progress, this command allows you to resume it. |
| 734 | If optional arguments N and M are given, an N by M board is used. | 734 | If optional arguments N and M are given, an N by M board is used. |
| 735 | If prefix arg is given for N, M is prompted for. | 735 | If prefix arg is given for N, M is prompted for. |
| 736 | 736 | ||
| 737 | You and Emacs play in turn by marking a free square. You mark it with X | 737 | You and Emacs play in turn by marking a free square. You mark it with X |
| 738 | and Emacs marks it with O. The winner is the first to get five contiguous | 738 | and Emacs marks it with O. The winner is the first to get five contiguous |
| 739 | marks horizontally, vertically or in diagonal. | 739 | marks horizontally, vertically or in diagonal. |
| 740 | 740 | ||
| 741 | You play by moving the cursor over the square you choose and hitting | 741 | You play by moving the cursor over the square you choose and hitting |
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 2987e6680a9..3efa13d03ae 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el | |||
| @@ -140,8 +140,8 @@ address for root variables.") | |||
| 140 | (defvar gdb-server-prefix nil) | 140 | (defvar gdb-server-prefix nil) |
| 141 | (defvar gdb-flush-pending-output nil) | 141 | (defvar gdb-flush-pending-output nil) |
| 142 | (defvar gdb-location-alist nil | 142 | (defvar gdb-location-alist nil |
| 143 | "Alist of breakpoint numbers and full filenames. Only used for files that | 143 | "Alist of breakpoint numbers and full filenames. |
| 144 | Emacs can't find.") | 144 | Only used for files that Emacs can't find.") |
| 145 | (defvar gdb-active-process nil | 145 | (defvar gdb-active-process nil |
| 146 | "GUD tooltips display variable values when t, and macro definitions otherwise.") | 146 | "GUD tooltips display variable values when t, and macro definitions otherwise.") |
| 147 | (defvar gdb-recording nil | 147 | (defvar gdb-recording nil |
| @@ -520,7 +520,7 @@ otherwise do not." | |||
| 520 | (not (display-graphic-p))))) | 520 | (not (display-graphic-p))))) |
| 521 | 521 | ||
| 522 | ;; If expr is a macro for a function don't print because of possible dangerous | 522 | ;; If expr is a macro for a function don't print because of possible dangerous |
| 523 | ;; side-effects. Also printing a function within a tooltip generates an | 523 | ;; side-effects. Also printing a function within a tooltip generates an |
| 524 | ;; unexpected starting annotation (phase error). | 524 | ;; unexpected starting annotation (phase error). |
| 525 | (defun gdb-tooltip-print-1 (expr) | 525 | (defun gdb-tooltip-print-1 (expr) |
| 526 | (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer) | 526 | (with-current-buffer (gdb-get-buffer 'gdb-partial-output-buffer) |
| @@ -1079,7 +1079,7 @@ INDENT is the current indentation depth." | |||
| 1079 | (if (or (<= (string-to-number children) gdb-max-children) | 1079 | (if (or (<= (string-to-number children) gdb-max-children) |
| 1080 | (y-or-n-p | 1080 | (y-or-n-p |
| 1081 | (format | 1081 | (format |
| 1082 | "%s has %s children. Continue? " expr children))) | 1082 | "%s has %s children. Continue? " expr children))) |
| 1083 | (if (and (eq (buffer-local-value | 1083 | (if (and (eq (buffer-local-value |
| 1084 | 'gud-minor-mode gud-comint-buffer) 'gdba) | 1084 | 'gud-minor-mode gud-comint-buffer) 'gdba) |
| 1085 | (string-equal gdb-version "pre-6.4")) | 1085 | (string-equal gdb-version "pre-6.4")) |
| @@ -1488,7 +1488,7 @@ not GDB." | |||
| 1488 | (let ((gud-running nil)) | 1488 | (let ((gud-running nil)) |
| 1489 | (gdb-invalidate-frames) | 1489 | (gdb-invalidate-frames) |
| 1490 | (unless (or gdb-register-names | 1490 | (unless (or gdb-register-names |
| 1491 | (string-equal gdb-version "pre-6.4")) | 1491 | (string-equal gdb-version "pre-6.4")) |
| 1492 | (gdb-enqueue-input | 1492 | (gdb-enqueue-input |
| 1493 | (list "server interpreter mi -data-list-register-names\n" | 1493 | (list "server interpreter mi -data-list-register-names\n" |
| 1494 | 'gdb-get-register-names)))) | 1494 | 'gdb-get-register-names)))) |
| @@ -1815,13 +1815,13 @@ Field names are wrapped in double quotes and equal signs are | |||
| 1815 | replaced with semicolons. | 1815 | replaced with semicolons. |
| 1816 | 1816 | ||
| 1817 | If FIX-KEY is non-nil, strip all \"FIX-KEY=\" occurences from | 1817 | If FIX-KEY is non-nil, strip all \"FIX-KEY=\" occurences from |
| 1818 | partial output. This is used to get rid of useless keys in lists | 1818 | partial output. This is used to get rid of useless keys in lists |
| 1819 | in MI messages, e.g.: [key=.., key=..]. -stack-list-frames and | 1819 | in MI messages, e.g.: [key=.., key=..]. -stack-list-frames and |
| 1820 | -break-info are examples of MI commands which issue such | 1820 | -break-info are examples of MI commands which issue such |
| 1821 | responses. | 1821 | responses. |
| 1822 | 1822 | ||
| 1823 | If FIX-LIST is non-nil, \"FIX-LIST={..}\" is replaced with | 1823 | If FIX-LIST is non-nil, \"FIX-LIST={..}\" is replaced with |
| 1824 | \"FIX-LIST=[..]\" prior to parsing. This is used to fix broken | 1824 | \"FIX-LIST=[..]\" prior to parsing. This is used to fix broken |
| 1825 | -break-info output when it contains breakpoint script field | 1825 | -break-info output when it contains breakpoint script field |
| 1826 | incompatible with GDB/MI output syntax." | 1826 | incompatible with GDB/MI output syntax." |
| 1827 | (save-excursion | 1827 | (save-excursion |
| @@ -1897,7 +1897,7 @@ FIX-KEY and FIX-KEY work as in `gdb-jsonify-buffer'." | |||
| 1897 | ;; annotation rule binding of whatever gdb sends to tell us this command | 1897 | ;; annotation rule binding of whatever gdb sends to tell us this command |
| 1898 | ;; might have changed it's output. | 1898 | ;; might have changed it's output. |
| 1899 | ;; | 1899 | ;; |
| 1900 | ;; NAME is the function name. DEMAND-PREDICATE tests if output is really needed. | 1900 | ;; NAME is the function name. DEMAND-PREDICATE tests if output is really needed. |
| 1901 | ;; GDB-COMMAND is a string of such. OUTPUT-HANDLER is the function bound to the | 1901 | ;; GDB-COMMAND is a string of such. OUTPUT-HANDLER is the function bound to the |
| 1902 | ;; input in the input queue (see comment about ``gdb communications'' above). | 1902 | ;; input in the input queue (see comment about ``gdb communications'' above). |
| 1903 | 1903 | ||
| @@ -2270,7 +2270,7 @@ corresponding to the mode line clicked." | |||
| 2270 | 2270 | ||
| 2271 | (defmacro gdb-propertize-header (name buffer help-echo mouse-face face) | 2271 | (defmacro gdb-propertize-header (name buffer help-echo mouse-face face) |
| 2272 | `(propertize ,name | 2272 | `(propertize ,name |
| 2273 | 'help-echo ,help-echo | 2273 | 'help-echo ,help-echo |
| 2274 | 'mouse-face ',mouse-face | 2274 | 'mouse-face ',mouse-face |
| 2275 | 'face ',face | 2275 | 'face ',face |
| 2276 | 'local-map | 2276 | 'local-map |
| @@ -2389,7 +2389,7 @@ corresponding to the mode line clicked." | |||
| 2389 | (goto-char (point-min)) | 2389 | (goto-char (point-min)) |
| 2390 | (forward-line (1- (string-to-number line))) | 2390 | (forward-line (1- (string-to-number line))) |
| 2391 | (set-window-point window (point)))))) | 2391 | (set-window-point window (point)))))) |
| 2392 | (error "No location specified.")))) | 2392 | (error "No location specified")))) |
| 2393 | 2393 | ||
| 2394 | 2394 | ||
| 2395 | ;; Frames buffer. This displays a perpetually correct backtrace | 2395 | ;; Frames buffer. This displays a perpetually correct backtrace |
| @@ -3284,7 +3284,7 @@ another GDB command e.g pwd, to see new frames") | |||
| 3284 | :button (:toggle . gdb-use-separate-io-buffer))) | 3284 | :button (:toggle . gdb-use-separate-io-buffer))) |
| 3285 | (define-key menu [gdb-many-windows] | 3285 | (define-key menu [gdb-many-windows] |
| 3286 | '(menu-item "Display Other Windows" gdb-many-windows | 3286 | '(menu-item "Display Other Windows" gdb-many-windows |
| 3287 | :help "Toggle display of locals, stack and breakpoint information" | 3287 | :help "Toggle display of locals, stack and breakpoint information." |
| 3288 | :button (:toggle . gdb-many-windows))) | 3288 | :button (:toggle . gdb-many-windows))) |
| 3289 | (define-key menu [gdb-restore-windows] | 3289 | (define-key menu [gdb-restore-windows] |
| 3290 | '(menu-item "Restore Window Layout" gdb-restore-windows | 3290 | '(menu-item "Restore Window Layout" gdb-restore-windows |
| @@ -4029,7 +4029,7 @@ from=\"\\(.*?\\)\"\\)") | |||
| 4029 | 4029 | ||
| 4030 | ;; Locals buffer. | 4030 | ;; Locals buffer. |
| 4031 | ;; | 4031 | ;; |
| 4032 | ;; uses "-stack-list-locals --simple-values". Needs GDB 6.1 onwards. | 4032 | ;; uses "-stack-list-locals --simple-values". Needs GDB 6.1 onwards. |
| 4033 | (gdb-set-buffer-rules 'gdb-locals-buffer | 4033 | (gdb-set-buffer-rules 'gdb-locals-buffer |
| 4034 | 'gdb-locals-buffer-name | 4034 | 'gdb-locals-buffer-name |
| 4035 | 'gdb-locals-mode) | 4035 | 'gdb-locals-mode) |
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 4cf275b3e6f..b73f8154fc4 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el | |||
| @@ -41,7 +41,7 @@ | |||
| 41 | 41 | ||
| 42 | ;;; Code: | 42 | ;;; Code: |
| 43 | (defvar idlwave-help-browse-url-available t | 43 | (defvar idlwave-help-browse-url-available t |
| 44 | "Whether browse-url is available") | 44 | "Whether browse-url is available.") |
| 45 | 45 | ||
| 46 | (require 'browse-url) | 46 | (require 'browse-url) |
| 47 | 47 | ||
| @@ -58,9 +58,9 @@ | |||
| 58 | (if idlwave-html-help-pre-v6 "#" "#wp")) | 58 | (if idlwave-html-help-pre-v6 "#" "#wp")) |
| 59 | 59 | ||
| 60 | (defcustom idlwave-html-system-help-location "help/online_help/" | 60 | (defcustom idlwave-html-system-help-location "help/online_help/" |
| 61 | "The directory, relative to idlwave-system-directory, where the idl | 61 | "The directory, relative to `idlwave-system-directory', where the IDL |
| 62 | HTML help files live, for IDL 6.2 and later. This location, if found, | 62 | HTML help files live, for IDL 6.2 and later. This location, if found, |
| 63 | is used in preference to the old idlwave-html-help-location." | 63 | is used in preference to the old `idlwave-html-help-location'." |
| 64 | :group 'idlwave-online-help | 64 | :group 'idlwave-online-help |
| 65 | :type 'directory) | 65 | :type 'directory) |
| 66 | 66 | ||
| @@ -69,7 +69,7 @@ is used in preference to the old idlwave-html-help-location." | |||
| 69 | nil | 69 | nil |
| 70 | "/usr/local/etc/") | 70 | "/usr/local/etc/") |
| 71 | "The directory where the idl_html_help/ dir lives. Obsolete for IDL | 71 | "The directory where the idl_html_help/ dir lives. Obsolete for IDL |
| 72 | 6.2 or later (see idlwave-html-system-help-location)." | 72 | 6.2 or later (see `idlwave-html-system-help-location')." |
| 73 | :group 'idlwave-online-help | 73 | :group 'idlwave-online-help |
| 74 | :type 'directory) | 74 | :type 'directory) |
| 75 | 75 | ||
| @@ -82,13 +82,13 @@ is used in preference to the old idlwave-html-help-location." | |||
| 82 | :type 'boolean) | 82 | :type 'boolean) |
| 83 | 83 | ||
| 84 | (defcustom idlwave-help-browser-function browse-url-browser-function | 84 | (defcustom idlwave-help-browser-function browse-url-browser-function |
| 85 | "Function to use to display html help. | 85 | "Function to use to display HTML help. |
| 86 | Defaults to `browse-url-browser-function', which see." | 86 | Defaults to `browse-url-browser-function', which see." |
| 87 | :group 'idlwave-online-help | 87 | :group 'idlwave-online-help |
| 88 | :type 'function) | 88 | :type 'function) |
| 89 | 89 | ||
| 90 | (defcustom idlwave-help-browser-generic-program browse-url-generic-program | 90 | (defcustom idlwave-help-browser-generic-program browse-url-generic-program |
| 91 | "Program to run if using browse-url-generic-program." | 91 | "Program to run if using `browse-url-generic-program'." |
| 92 | :group 'idlwave-online-help | 92 | :group 'idlwave-online-help |
| 93 | :type 'string) | 93 | :type 'string) |
| 94 | 94 | ||
| @@ -97,7 +97,7 @@ Defaults to `browse-url-browser-function', which see." | |||
| 97 | (defcustom idlwave-help-browser-generic-args | 97 | (defcustom idlwave-help-browser-generic-args |
| 98 | (if (boundp 'browse-url-generic-args) | 98 | (if (boundp 'browse-url-generic-args) |
| 99 | browse-url-generic-args "") | 99 | browse-url-generic-args "") |
| 100 | "Program args to use if using browse-url-generic-program." | 100 | "Program args to use if using `browse-url-generic-program'." |
| 101 | :group 'idlwave-online-help | 101 | :group 'idlwave-online-help |
| 102 | :type 'string) | 102 | :type 'string) |
| 103 | 103 | ||
| @@ -112,7 +112,7 @@ must be explicitly set non-nil in order for the variable | |||
| 112 | :type 'boolean) | 112 | :type 'boolean) |
| 113 | 113 | ||
| 114 | (defvar idlwave-help-directory "" | 114 | (defvar idlwave-help-directory "" |
| 115 | "Obsolete variable. See idlwave-html-help-location.") | 115 | "Obsolete variable. See `idlwave-html-help-location'.") |
| 116 | 116 | ||
| 117 | (defcustom idlwave-help-use-dedicated-frame t | 117 | (defcustom idlwave-help-use-dedicated-frame t |
| 118 | "*Non-nil means, use a separate frame for Online Help if possible." | 118 | "*Non-nil means, use a separate frame for Online Help if possible." |
| @@ -210,10 +210,10 @@ support." | |||
| 210 | "The default width of the help frame.") | 210 | "The default width of the help frame.") |
| 211 | 211 | ||
| 212 | (defvar idlwave-html-help-is-available nil | 212 | (defvar idlwave-html-help-is-available nil |
| 213 | "Is the system online help text avaiable?") | 213 | "Is the system online help text available?") |
| 214 | 214 | ||
| 215 | (defvar idlwave-help-mode-line-indicator "" | 215 | (defvar idlwave-help-mode-line-indicator "" |
| 216 | "Used for the special mode line in the idlwave-help-mode.") | 216 | "Used for the special mode line in the `idlwave-help-mode'.") |
| 217 | 217 | ||
| 218 | (defvar idlwave-help-window-configuration nil) | 218 | (defvar idlwave-help-window-configuration nil) |
| 219 | (defvar idlwave-help-special-topic-words nil) ; defined by get_rinfo | 219 | (defvar idlwave-help-special-topic-words nil) ; defined by get_rinfo |
| @@ -221,7 +221,7 @@ support." | |||
| 221 | ;; Define the key bindings for the Help application | 221 | ;; Define the key bindings for the Help application |
| 222 | 222 | ||
| 223 | (defvar idlwave-help-mode-map (make-sparse-keymap) | 223 | (defvar idlwave-help-mode-map (make-sparse-keymap) |
| 224 | "The keymap used in idlwave-help-mode.") | 224 | "The keymap used in `idlwave-help-mode'.") |
| 225 | 225 | ||
| 226 | (define-key idlwave-help-mode-map "q" 'idlwave-help-quit) | 226 | (define-key idlwave-help-mode-map "q" 'idlwave-help-quit) |
| 227 | (define-key idlwave-help-mode-map "w" 'widen) | 227 | (define-key idlwave-help-mode-map "w" 'widen) |
| @@ -303,7 +303,7 @@ When the hep text is a source file, the following commands are available | |||
| 303 | Fontification: [F]ontify the buffer like source code | 303 | Fontification: [F]ontify the buffer like source code |
| 304 | Jump: [h] to function doclib header | 304 | Jump: [h] to function doclib header |
| 305 | [H] to file doclib header | 305 | [H] to file doclib header |
| 306 | [.] back and forward between header and definition | 306 | [.] back and forth between header and definition |
| 307 | 307 | ||
| 308 | Here are all keybindings. | 308 | Here are all keybindings. |
| 309 | \\{idlwave-help-mode-map}" | 309 | \\{idlwave-help-mode-map}" |
| @@ -367,7 +367,7 @@ Here are all keybindings. | |||
| 367 | (defvar idlwave-experimental) | 367 | (defvar idlwave-experimental) |
| 368 | (defvar idlwave-last-context-help-pos) | 368 | (defvar idlwave-last-context-help-pos) |
| 369 | (defun idlwave-do-context-help (&optional arg) | 369 | (defun idlwave-do-context-help (&optional arg) |
| 370 | "Wrapper around the call to idlwave-context-help1. | 370 | "Wrapper around the call to `idlwave-do-context-help1'. |
| 371 | It collects and prints the diagnostics messages." | 371 | It collects and prints the diagnostics messages." |
| 372 | (let ((marker (list (current-buffer) (point))) | 372 | (let ((marker (list (current-buffer) (point))) |
| 373 | (idlwave-help-diagnostics nil)) | 373 | (idlwave-help-diagnostics nil)) |
| @@ -766,7 +766,7 @@ if passed as a function. See `idlwave-help-use-dedicated-frame'." | |||
| 766 | "Display HTML or other special help on a certain topic. | 766 | "Display HTML or other special help on a certain topic. |
| 767 | Either loads an HTML link, if LINK is non-nil, or gets special-help on | 767 | Either loads an HTML link, if LINK is non-nil, or gets special-help on |
| 768 | the optional arguments, if any special help is defined. If LINK is | 768 | the optional arguments, if any special help is defined. If LINK is |
| 769 | `t', first look up the optional arguments in the routine info list to | 769 | t, first look up the optional arguments in the routine info list to |
| 770 | see if a link is set for it. Try extra help functions if necessary." | 770 | see if a link is set for it. Try extra help functions if necessary." |
| 771 | ;; Lookup link | 771 | ;; Lookup link |
| 772 | (if (eq link t) | 772 | (if (eq link t) |
| @@ -817,7 +817,7 @@ see if a link is set for it. Try extra help functions if necessary." | |||
| 817 | (select-window cw))) | 817 | (select-window cw))) |
| 818 | 818 | ||
| 819 | (defun idlwave-help-html-link (link) | 819 | (defun idlwave-help-html-link (link) |
| 820 | "Get html help on a given LINK." | 820 | "Get HTML help on a given LINK." |
| 821 | (let ((browse-url-browser-function idlwave-help-browser-function) | 821 | (let ((browse-url-browser-function idlwave-help-browser-function) |
| 822 | (help-loc (idlwave-html-help-location)) | 822 | (help-loc (idlwave-html-help-location)) |
| 823 | (browse-url-generic-program idlwave-help-browser-generic-program) | 823 | (browse-url-generic-program idlwave-help-browser-generic-program) |
| @@ -847,14 +847,14 @@ see if a link is set for it. Try extra help functions if necessary." | |||
| 847 | (defvar idlwave-current-tags-buffer) | 847 | (defvar idlwave-current-tags-buffer) |
| 848 | (defvar idlwave-current-tags-class) | 848 | (defvar idlwave-current-tags-class) |
| 849 | (defun idlwave-help-with-source (name type class keyword) | 849 | (defun idlwave-help-with-source (name type class keyword) |
| 850 | "Provide help for routines not documented in the IDL manuals. Works | 850 | "Provide help for routines not documented in the IDL manuals. |
| 851 | by loading the routine source file into the help buffer. Depending on | 851 | Works by loading the routine source file into the help buffer. |
| 852 | the value of `idlwave-help-source-try-header', it attempts to show the | 852 | Depending on the value of `idlwave-help-source-try-header', it |
| 853 | routine definition or the header description. If | 853 | attempts to show the routine definition or the header description. |
| 854 | `idlwave-help-do-class-struct-tag' is non-nil, keyword is a tag to | 854 | If `idlwave-help-do-class-struct-tag' is non-nil, keyword is a tag |
| 855 | show help on from the class definition structure. If | 855 | to show help on from the class definition structure. |
| 856 | `idlwave-help-do-struct-tag' is non-nil, show help from the matching | 856 | If `idlwave-help-do-struct-tag' is non-nil, show help from the |
| 857 | structure tag definition. | 857 | matching structure tag definition. |
| 858 | 858 | ||
| 859 | This function can be used as `idlwave-extra-help-function'." | 859 | This function can be used as `idlwave-extra-help-function'." |
| 860 | (let* ((class-struct-tag idlwave-help-do-class-struct-tag) | 860 | (let* ((class-struct-tag idlwave-help-do-class-struct-tag) |
| @@ -953,7 +953,8 @@ This function can be used as `idlwave-extra-help-function'." | |||
| 953 | 953 | ||
| 954 | (defun idlwave-help-find-routine-definition (name type class keyword) | 954 | (defun idlwave-help-find-routine-definition (name type class keyword) |
| 955 | "Find the definition of routine CLASS::NAME in current buffer. | 955 | "Find the definition of routine CLASS::NAME in current buffer. |
| 956 | KEYWORD is ignored. Returns the point of match if successful, nil otherwise." | 956 | Returns the point of match if successful, nil otherwise. |
| 957 | KEYWORD is ignored." | ||
| 957 | (save-excursion | 958 | (save-excursion |
| 958 | (goto-char (point-max)) | 959 | (goto-char (point-max)) |
| 959 | (if (re-search-backward | 960 | (if (re-search-backward |
| @@ -1199,7 +1200,7 @@ Useful when source code is displayed as help. See the option | |||
| 1199 | "(help location unknown)"))) | 1200 | "(help location unknown)"))) |
| 1200 | 1201 | ||
| 1201 | (defun idlwave-help-show-help-frame () | 1202 | (defun idlwave-help-show-help-frame () |
| 1202 | "Show the help frame, creating it if necessary" | 1203 | "Show the help frame, creating it if necessary." |
| 1203 | ;; Use a special frame for this | 1204 | ;; Use a special frame for this |
| 1204 | (unless (frame-live-p idlwave-help-frame) | 1205 | (unless (frame-live-p idlwave-help-frame) |
| 1205 | (setq idlwave-help-frame | 1206 | (setq idlwave-help-frame |
| @@ -1254,7 +1255,7 @@ Useful when source code is displayed as help. See the option | |||
| 1254 | (if (memq system-type '(ms-dos windows-nt)) | 1255 | (if (memq system-type '(ms-dos windows-nt)) |
| 1255 | "bin/bin.x86/idl_assistant.exe" | 1256 | "bin/bin.x86/idl_assistant.exe" |
| 1256 | "bin/idl_assistant") | 1257 | "bin/idl_assistant") |
| 1257 | "The command, rooted at idlwave-system-directory, which invokes the | 1258 | "The command, rooted at `idlwave-system-directory', which invokes the |
| 1258 | IDL assistant.") | 1259 | IDL assistant.") |
| 1259 | 1260 | ||
| 1260 | (defun idlwave-help-assistant-available () | 1261 | (defun idlwave-help-assistant-available () |
| @@ -1293,7 +1294,7 @@ IDL assistant.") | |||
| 1293 | (unless (accept-process-output idlwave-help-assistant-process 15) | 1294 | (unless (accept-process-output idlwave-help-assistant-process 15) |
| 1294 | (error "Failed binding IDL_ASSISTANT socket")) | 1295 | (error "Failed binding IDL_ASSISTANT socket")) |
| 1295 | (if (not port) | 1296 | (if (not port) |
| 1296 | (error "Unable to open IDL_ASSISTANT.") | 1297 | (error "Unable to open IDL_ASSISTANT") |
| 1297 | (set-process-filter idlwave-help-assistant-process nil) | 1298 | (set-process-filter idlwave-help-assistant-process nil) |
| 1298 | (setq idlwave-help-assistant-socket | 1299 | (setq idlwave-help-assistant-socket |
| 1299 | (open-network-stream "IDL_ASSISTANT_SOCK" | 1300 | (open-network-stream "IDL_ASSISTANT_SOCK" |
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el index ab3c7781868..7f09d83399b 100644 --- a/lisp/progmodes/octave-mod.el +++ b/lisp/progmodes/octave-mod.el | |||
| @@ -410,7 +410,7 @@ Non-nil means always go to the next Octave code line after sending." | |||
| 410 | 410 | ||
| 411 | This mode makes it easier to write Octave code by helping with | 411 | This mode makes it easier to write Octave code by helping with |
| 412 | indentation, doing some of the typing for you (with Abbrev mode) and by | 412 | indentation, doing some of the typing for you (with Abbrev mode) and by |
| 413 | showing keywords, comments, strings, etc.. in different faces (with | 413 | showing keywords, comments, strings, etc. in different faces (with |
| 414 | Font Lock mode on terminals that support it). | 414 | Font Lock mode on terminals that support it). |
| 415 | 415 | ||
| 416 | Octave itself is a high-level language, primarily intended for numerical | 416 | Octave itself is a high-level language, primarily intended for numerical |
| @@ -1260,7 +1260,7 @@ If Abbrev mode is on, expand abbrevs first." | |||
| 1260 | (defun octave-electric-semi () | 1260 | (defun octave-electric-semi () |
| 1261 | "Insert a semicolon in Octave mode. | 1261 | "Insert a semicolon in Octave mode. |
| 1262 | Maybe expand abbrevs and blink matching block open keywords. | 1262 | Maybe expand abbrevs and blink matching block open keywords. |
| 1263 | Reindent the line of `octave-auto-indent' is non-nil. | 1263 | Reindent the line if `octave-auto-indent' is non-nil. |
| 1264 | Insert a newline if `octave-auto-newline' is non-nil." | 1264 | Insert a newline if `octave-auto-newline' is non-nil." |
| 1265 | (interactive) | 1265 | (interactive) |
| 1266 | (if (not (octave-not-in-string-or-comment-p)) | 1266 | (if (not (octave-not-in-string-or-comment-p)) |
| @@ -1277,7 +1277,7 @@ Insert a newline if `octave-auto-newline' is non-nil." | |||
| 1277 | (defun octave-electric-space () | 1277 | (defun octave-electric-space () |
| 1278 | "Insert a space in Octave mode. | 1278 | "Insert a space in Octave mode. |
| 1279 | Maybe expand abbrevs and blink matching block open keywords. | 1279 | Maybe expand abbrevs and blink matching block open keywords. |
| 1280 | Reindent the line of `octave-auto-indent' is non-nil." | 1280 | Reindent the line if `octave-auto-indent' is non-nil." |
| 1281 | (interactive) | 1281 | (interactive) |
| 1282 | (setq last-command-event ? ) | 1282 | (setq last-command-event ? ) |
| 1283 | (if (and octave-auto-indent | 1283 | (if (and octave-auto-indent |