(switch_to_buffer_1): New subroutine, taken out from Fswitch_to_buffer.

[gnu-emacs] / lisp / ediff-init.el

diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index d5ac60b2a8124f9d0ef53421411726e5cde55852..fc91c7bbea2948d8003e73c2d129286c78f109bb 100644 (file)
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -992,7 +992,7 @@ this variable represents.")
 
 (defface ediff-even-diff-face-A
   '((((class color)) (:foreground "Black" :background "light grey"))
-    (t (:italic t :stipple "Stipple")))
+    (t (:italic t :stipple "stipple")))
   "Face for highlighting even-numbered non-current differences in buffer A."
   :group 'ediff-highlighting)
 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
@@ -1006,7 +1006,7 @@ this variable represents.")
 
 (defface ediff-even-diff-face-B
   '((((class color)) (:foreground "White" :background "Grey"))
-    (t (:italic t :stipple "Stipple")))
+    (t (:italic t :stipple "stipple")))
   "Face for highlighting even-numbered non-current differences in buffer B."
   :group 'ediff-highlighting)
 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
@@ -1020,7 +1020,7 @@ this variable represents.")
 
 (defface ediff-even-diff-face-C
   '((((class color)) (:foreground "Black" :background "light grey"))
-    (t (:italic t :stipple "Stipple")))
+    (t (:italic t :stipple "stipple")))
   "Face for highlighting even-numbered non-current differences in buffer C."
   :group 'ediff-highlighting)
 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
@@ -1034,7 +1034,7 @@ this variable represents.")
 
 (defface ediff-even-diff-face-Ancestor
   '((((class color)) (:foreground "White" :background "Grey"))
-    (t (:italic t :stipple "Stipple")))
+    (t (:italic t :stipple "stipple")))
   "Face for highlighting even-numbered non-current differences in the ancestor buffer."
   :group 'ediff-highlighting)
 ;; An internal variable. Ediff takes the face from here. When unhighlighting,
@@ -1190,7 +1190,8 @@ This property can be toggled interactively."
 Nil means don't save automatically. t means always save. Anything but nil or t
 means save automatically only if the merge job is part of a group of jobs, such
 as `ediff-merge-directory' or `ediff-merge-directory-revisions'."
-  :type '(choice (const nil) (const t) (const group-jobs-only))
+  :type '(choice (const nil) (const t)
+                (other :tag "group-jobs-only" group-jobs-only))
   :group 'ediff-merge)
 (make-variable-buffer-local 'ediff-autostore-merges)
 
@@ -1204,21 +1205,9 @@ Instead, C-h would jump to previous difference."
   :group 'ediff)
   
 (defcustom ediff-temp-file-prefix
-  (let ((env (or (getenv "TMPDIR")
-                (getenv "TMP")
-                (getenv "TEMP")))
-       d)
-    (setq d (if (and env (> (length env) 0))
-               env
-             (cond ((memq system-type '(vax-vms axp-vms)) "SYS$SCRATCH:")
-                   ((eq system-type 'ms-dos) "c:/")
-                   (t "/tmp"))))
-    ;; The following is to make sure we get something to which we can
-    ;; add directory levels under VMS.
-    (setq d (file-name-as-directory (directory-file-name d)))
-    )
+  (file-name-as-directory temporary-file-directory)
   "*Prefix to put on Ediff temporary file names.
-Do not start with `~/' or `~user-name/'."
+Do not start with `~/' or `~USERNAME/'."
   :type 'string
   :group 'ediff)