X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/08861c5cb87e91e83e5b0bf53cb53c1377434c8f..6bdad9ae02d440a259713ea4a8942d1168e7f452:/lisp/ediff-mult.el

diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 443ebdcbed..b9ffb37376 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1,16 +1,16 @@
 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,9 +18,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -115,13 +113,8 @@
 
 ;; compiler pacifier
 (eval-when-compile
-  (require 'ediff-init)
-  (if (not (featurep 'ediff-util))
-      (require 'ediff-util))
-  (if (not (featurep 'ediff-ptch))
-      (require 'ediff-ptch))
-  (require 'ediff)
-  )
+  (require 'ediff-ptch)
+  (require 'ediff))
 ;; end pacifier
 
 (require 'ediff-init)
@@ -209,47 +202,47 @@ Should be a sexp.  For instance (car ediff-filtering-regexp-history) or nil."
 (defvar ediff-session-registry nil)
 
 (defcustom ediff-meta-truncate-filenames t
-  "*If non-nil, truncate long file names in the session group buffers.
+  "If non-nil, truncate long file names in the session group buffers.
 This can be toggled with `ediff-toggle-filename-truncation'."
   :type 'boolean
   :group 'ediff-mult)
 
 (defcustom ediff-meta-mode-hook nil
-  "*Hooks run just after setting up meta mode."
+  "Hooks run just after setting up meta mode."
   :type 'hook
   :group 'ediff-mult)
 
 (defcustom ediff-registry-setup-hook nil
-  "*Hooks run just after the registry control panel is set up."
+  "Hooks run just after the registry control panel is set up."
   :type 'hook
   :group 'ediff-mult)
 
 (defcustom ediff-before-session-group-setup-hooks nil
-  "*Hooks to run before Ediff arranges the window for group-level operations.
+  "Hooks to run before Ediff arranges the window for group-level operations.
 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'."
   :type 'hook
   :group 'ediff-hook)
 (defcustom ediff-after-session-group-setup-hook nil
-  "*Hooks run just after a meta-buffer controlling a session group, such as
+  "Hooks run just after a meta-buffer controlling a session group, such as
 ediff-directories, is run."
   :type 'hook
   :group 'ediff-mult)
 (defcustom ediff-quit-session-group-hook nil
-  "*Hooks run just before exiting a session group."
+  "Hooks run just before exiting a session group."
   :type 'hook
   :group 'ediff-mult)
 (defcustom ediff-show-registry-hook nil
-  "*Hooks run just after the registry buffer is shown."
+  "Hooks run just after the registry buffer is shown."
   :type 'hook
   :group 'ediff-mult)
 (defcustom ediff-show-session-group-hook '(delete-other-windows)
-  "*Hooks run just after a session group buffer is shown."
+  "Hooks run just after a session group buffer is shown."
   :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."
@@ -2351,10 +2344,10 @@ If this is a session registry buffer then just bury it."
 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."
+`last-command-event' is used to decide which action to take."
   (interactive)
   (if (null action)
-      (setq action last-command-char))
+      (setq action last-command-event))
   (let ((list (cdr ediff-meta-list))
 	marked1 marked2 marked3
 	fileinfo1 fileinfo2 fileinfo3 elt)
@@ -2403,11 +2396,11 @@ for operation, or simply indicate which are equal files.  If it is nil, then
 
 
 
-;;; Local Variables:
-;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
-;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
-;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
-;;; End:
+;; Local Variables:
+;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
+;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
+;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
+;; End:
 
 ;; arch-tag: c8a76898-f96f-4d9c-be9d-129134017188
 ;;; ediff-mult.el ends here