Mercurial > emacs
changeset 68489:6d1e5d8e3112
(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.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Mon, 30 Jan 2006 15:15:00 +0000 |
| parents | 7e5ddc2f6715 |
| children | 36ac94b7246c |
| files | lisp/ediff-mult.el |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ediff-mult.el Mon Jan 30 15:06:50 2006 +0000 +++ b/lisp/ediff-mult.el Mon Jan 30 15:15:00 2006 +0000 @@ -176,7 +176,7 @@ (defcustom ediff-default-filtering-regexp nil "The default regular expression used as a filename filter in multifile comparisons. -Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil." +Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil." :type 'sexp :group 'ediff-mult) @@ -219,9 +219,9 @@ (defcustom ediff-before-session-group-setup-hooks nil "*Hooks to run before Ediff arranges the window for group-level operations. -It is used by commands such as ediff-directories. +It is used by commands such as `ediff-directories'. This hook can be used to save the previous window config, which can be restored -on ediff-quit, ediff-suspend, or ediff-quit-session-group-hook." +on `ediff-quit', `ediff-suspend', or `ediff-quit-session-group-hook'." :type 'hook :group 'ediff-hook) (defcustom ediff-after-session-group-setup-hook nil @@ -242,7 +242,7 @@ :type 'hook :group 'ediff-mult) (defcustom ediff-meta-buffer-keymap-setup-hook nil - "*Hooks run just after setting up the ediff-meta-buffer-map. + "*Hooks run just after setting up the `ediff-meta-buffer-map'. This keymap controls key bindings in the meta buffer and is a local variable. This means that you can set different bindings for different kinds of meta buffers." @@ -363,7 +363,7 @@ (file-directory-p (ediff-get-session-objC-name session-info)) t))) ;; set up the keymap in the meta buffer -(defun ediff-setup-meta-map() +(defun ediff-setup-meta-map () (setq ediff-meta-buffer-map (make-sparse-keymap)) (suppress-keymap ediff-meta-buffer-map) (define-key ediff-meta-buffer-map "q" 'ediff-quit-meta-buffer) @@ -2332,8 +2332,8 @@ "Run through the session list and mark identical files. This is used only for sessions that involve 2 or 3 files at the same time. ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark -for operation, or simply indicate which are equal files. If it is nil, then -last-command-char is used to decide which action to take." +for operation, or simply indicate which are equal files. If it is nil, then +`last-command-char' is used to decide which action to take." (interactive) (if (null action) (setq action last-command-char))