diff options
| author | Juanma Barranquero | 2006-01-30 15:15:00 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2006-01-30 15:15:00 +0000 |
| commit | cd25a248cec19ba9b0869066ed67ada9c6caf117 (patch) | |
| tree | 86fcdb334be114a563130408ab22bd6100f58110 | |
| parent | 9872af18af813100ffeacb38f81af31ba945e69c (diff) | |
| download | emacs-cd25a248cec19ba9b0869066ed67ada9c6caf117.tar.gz emacs-cd25a248cec19ba9b0869066ed67ada9c6caf117.zip | |
(ediff-meta-buffer-keymap-setup-hook, ediff-before-session-group-setup-hooks,
ediff-default-filtering-regexp, ediff-meta-mark-equal-files):
Fix typos in docstrings.
| -rw-r--r-- | lisp/ediff-mult.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 532b491adfa..f4ad4f1e612 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el | |||
| @@ -176,7 +176,7 @@ directories.") | |||
| 176 | 176 | ||
| 177 | (defcustom ediff-default-filtering-regexp nil | 177 | (defcustom ediff-default-filtering-regexp nil |
| 178 | "The default regular expression used as a filename filter in multifile comparisons. | 178 | "The default regular expression used as a filename filter in multifile comparisons. |
| 179 | Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil." | 179 | Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil." |
| 180 | :type 'sexp | 180 | :type 'sexp |
| 181 | :group 'ediff-mult) | 181 | :group 'ediff-mult) |
| 182 | 182 | ||
| @@ -219,9 +219,9 @@ This can be toggled with `ediff-toggle-filename-truncation'." | |||
| 219 | 219 | ||
| 220 | (defcustom ediff-before-session-group-setup-hooks nil | 220 | (defcustom ediff-before-session-group-setup-hooks nil |
| 221 | "*Hooks to run before Ediff arranges the window for group-level operations. | 221 | "*Hooks to run before Ediff arranges the window for group-level operations. |
| 222 | It is used by commands such as ediff-directories. | 222 | It is used by commands such as `ediff-directories'. |
| 223 | This hook can be used to save the previous window config, which can be restored | 223 | This hook can be used to save the previous window config, which can be restored |
| 224 | on ediff-quit, ediff-suspend, or ediff-quit-session-group-hook." | 224 | on `ediff-quit', `ediff-suspend', or `ediff-quit-session-group-hook'." |
| 225 | :type 'hook | 225 | :type 'hook |
| 226 | :group 'ediff-hook) | 226 | :group 'ediff-hook) |
| 227 | (defcustom ediff-after-session-group-setup-hook nil | 227 | (defcustom ediff-after-session-group-setup-hook nil |
| @@ -242,7 +242,7 @@ ediff-directories, is run." | |||
| 242 | :type 'hook | 242 | :type 'hook |
| 243 | :group 'ediff-mult) | 243 | :group 'ediff-mult) |
| 244 | (defcustom ediff-meta-buffer-keymap-setup-hook nil | 244 | (defcustom ediff-meta-buffer-keymap-setup-hook nil |
| 245 | "*Hooks run just after setting up the ediff-meta-buffer-map. | 245 | "*Hooks run just after setting up the `ediff-meta-buffer-map'. |
| 246 | This keymap controls key bindings in the meta buffer and is a local variable. | 246 | This keymap controls key bindings in the meta buffer and is a local variable. |
| 247 | This means that you can set different bindings for different kinds of meta | 247 | This means that you can set different bindings for different kinds of meta |
| 248 | buffers." | 248 | buffers." |
| @@ -363,7 +363,7 @@ buffers." | |||
| 363 | (file-directory-p (ediff-get-session-objC-name session-info)) t))) | 363 | (file-directory-p (ediff-get-session-objC-name session-info)) t))) |
| 364 | 364 | ||
| 365 | ;; set up the keymap in the meta buffer | 365 | ;; set up the keymap in the meta buffer |
| 366 | (defun ediff-setup-meta-map() | 366 | (defun ediff-setup-meta-map () |
| 367 | (setq ediff-meta-buffer-map (make-sparse-keymap)) | 367 | (setq ediff-meta-buffer-map (make-sparse-keymap)) |
| 368 | (suppress-keymap ediff-meta-buffer-map) | 368 | (suppress-keymap ediff-meta-buffer-map) |
| 369 | (define-key ediff-meta-buffer-map "q" 'ediff-quit-meta-buffer) | 369 | (define-key ediff-meta-buffer-map "q" 'ediff-quit-meta-buffer) |
| @@ -2332,8 +2332,8 @@ If this is a session registry buffer then just bury it." | |||
| 2332 | "Run through the session list and mark identical files. | 2332 | "Run through the session list and mark identical files. |
| 2333 | This is used only for sessions that involve 2 or 3 files at the same time. | 2333 | This is used only for sessions that involve 2 or 3 files at the same time. |
| 2334 | ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark | 2334 | ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark |
| 2335 | for operation, or simply indicate which are equal files. If it is nil, then | 2335 | for operation, or simply indicate which are equal files. If it is nil, then |
| 2336 | last-command-char is used to decide which action to take." | 2336 | `last-command-char' is used to decide which action to take." |
| 2337 | (interactive) | 2337 | (interactive) |
| 2338 | (if (null action) | 2338 | (if (null action) |
| 2339 | (setq action last-command-char)) | 2339 | (setq action last-command-char)) |