diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-03-22 16:11:53 +0000 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-03-22 16:11:53 +0000 |
| commit | eb1d22b136a3f7a49b4060553b79ee188f55a498 (patch) | |
| tree | 9f9e5ddc960b8484bc6e9413ee7bb155abb066f3 /lisp/vc/ediff-init.el | |
| parent | 855940df6bde5ed41ed55336a3ac6f6ae0c6267e (diff) | |
| parent | 813478c8557541efa918de18f7d863a33210a598 (diff) | |
| download | emacs-eb1d22b136a3f7a49b4060553b79ee188f55a498.tar.gz emacs-eb1d22b136a3f7a49b4060553b79ee188f55a498.tar.bz2 emacs-eb1d22b136a3f7a49b4060553b79ee188f55a498.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/vc/ediff-init.el')
| -rw-r--r-- | lisp/vc/ediff-init.el | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index cbd8c0d322c..e59d4b57b5c 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -1257,22 +1257,8 @@ Instead, C-h would jump to previous difference." :type 'boolean :group 'ediff) -;; This is the same as temporary-file-directory from Emacs 20.3. -;; Copied over here because XEmacs doesn't have this variable. -(defcustom ediff-temp-file-prefix - (file-name-as-directory - (cond ((boundp 'temporary-file-directory) temporary-file-directory) - ((fboundp 'temp-directory) (temp-directory)) - (t "/tmp/"))) -;;; (file-name-as-directory -;;; (cond ((memq system-type '(ms-dos windows-nt)) -;;; (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp")) -;;; (t -;;; (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp")))) - "Prefix to put on Ediff temporary file names. -Do not start with `~/' or `~USERNAME/'." - :type 'string - :group 'ediff) +(define-obsolete-variable-alias 'ediff-temp-file-prefix + 'temporary-file-directory "28.1") (defcustom ediff-temp-file-mode 384 ; u=rw only "Mode for Ediff temporary files." @@ -1287,8 +1273,8 @@ This default should work without changes." :type 'regexp :group 'ediff) -;; needed to simulate frame-char-width in XEmacs. -(defvar ediff-H-glyph (if (featurep 'xemacs) (make-glyph "H"))) +(defvar ediff-H-glyph nil) +(make-obsolete-variable 'ediff-H-glyph nil "28.1") ;; Temporary file used for refining difference regions in buffer A. |