Relax existing-registration check in vc-register (tiny change).

[gnu-emacs] / lisp / vc / emerge.el

diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 5435a840ac9b1ddb6c86ab100e9db17bd25500f7..0a1bd04412569d8845337170d54ff6c8dd59f14b 100644 (file)
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -39,13 +39,13 @@
 (defmacro emerge-defvar-local (var value doc)
   "Defines SYMBOL as an advertised variable.
 Performs a defvar, then executes `make-variable-buffer-local' on
-the variable.  Also sets the `preserved' property, so that
+the variable.  Also sets the `permanent-local' property, so that
 `kill-all-local-variables' (called by major-mode setting commands)
 won't destroy Emerge control variables."
   `(progn
     (defvar ,var ,value ,doc)
     (make-variable-buffer-local ',var)
-    (put ',var 'preserved t)))
+    (put ',var 'permanent-local t)))
 
 ;; Add entries to minor-mode-alist so that emerge modes show correctly
 (defvar emerge-minor-modes-list
@@ -76,18 +76,6 @@ Commands:
 Commands must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in `edit' mode,
 but can be invoked directly in `fast' mode.")
 
-(define-obsolete-variable-alias 'emerge-version 'emacs-version "23.2")
-
-(defun emerge-version ()
-  "Return string describing the version of Emerge.
-When called interactively, displays the version."
-  (interactive)
-  (if (called-interactively-p 'interactive)
-      (message "Emerge version %s" emacs-version)
-    emacs-version))
-
-(make-obsolete 'emerge-version 'emacs-version "23.2")
-
 ;;; Emerge configuration variables
 
 (defgroup emerge nil
@@ -524,10 +512,10 @@ replaced by emerge-fast-keymap.")
 (emerge-defvar-local emerge-old-keymap nil
   "The original local keymap for the merge buffer.")
 (emerge-defvar-local emerge-auto-advance nil
-  "*If non-nil, emerge-select-A and emerge-select-B automatically advance to
+                    "If non-nil, emerge-select-A and emerge-select-B automatically advance to
 the next difference.")
 (emerge-defvar-local emerge-skip-prefers nil
-  "*If non-nil, differences for which there is a preference are automatically
+                    "If non-nil, differences for which there is a preference are automatically
 skipped.")
 (emerge-defvar-local emerge-quit-hook nil
   "Hooks to run in the merge buffer after the merge has been finished.
@@ -1354,8 +1342,8 @@ Otherwise, the A or B file present is copied to the output file."
   (delete-other-windows)
   (switch-to-buffer merge-buffer)
   (emerge-refresh-mode-line)
-  (split-window-vertically)
-  (split-window-horizontally)
+  (split-window-below)
+  (split-window-right)
   (switch-to-buffer buffer-A)
   (if pos
       (goto-char (point-min)))
@@ -1754,7 +1742,7 @@ to the left margin, if they are in windows."
 ;; If there are min-lines lines above and below the region, then don't do
 ;; anything.
 ;; If not, recenter the region to make it so.
-;; If that isn't possible, remove context lines balancedly from top and bottom
+;; If that isn't possible, remove context lines evenly from top and bottom
 ;; so the entire region shows.
 ;; If that isn't possible, show the top of the region.
 ;; BEG must be at the beginning of a line.
@@ -2121,7 +2109,7 @@ Use C-u l to reset the windows afterward."
   (delete-other-windows)
   (let ((temp-buffer-show-function
         (lambda (buf)
-          (split-window-vertically)
+          (split-window-below)
           (switch-to-buffer buf)
           (other-window 1))))
     (with-output-to-temp-buffer "*Help*"