diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-04-08 13:16:08 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-04-08 13:16:08 -0700 |
| commit | bca1fde85f44d0cb04aec25b0a93d37bbd757460 (patch) | |
| tree | 1fbc47f3b0b15acbfddb73eacf61ad58940ede79 /lisp/vc/ediff-util.el | |
| parent | b7d61609bd2a5a97b63733a4c16194850e48de2a (diff) | |
| download | emacs-bca1fde85f44d0cb04aec25b0a93d37bbd757460.tar.gz emacs-bca1fde85f44d0cb04aec25b0a93d37bbd757460.tar.bz2 emacs-bca1fde85f44d0cb04aec25b0a93d37bbd757460.zip | |
Remove references to OS/2 in code, doc, and comments
* lisp/gnus/nnheader.el (nnheader-read-timeout)
(nnheader-file-name-translation-alist): Remove OS/2 case, and simplify.
* lisp/emulation/viper-util.el (viper-color-defined-p):
* lisp/net/pop3.el (pop3-read-timeout):
* lisp/net/imap.el (imap-read-timeout):
* lisp/url/url-privacy.el (url-setup-privacy-info): Remove OS/2 case.
* lisp/emulation/viper-ex.el (viper-glob-function):
* lisp/vc/ediff-util.el (ediff-submit-report): Doc fix.
* lisp/cus-edit.el (custom-display): Remove "pm" (OS/2).
* doc/emacs/msdos-xtra.texi (MS-DOS):
* doc/misc/gnus.texi (Various Various):
* doc/misc/viper.texi (Rudimentary Changes): Remove mentions of OS/2.
; * lisp/url/url.el, lisp/url/url-vars.el:
; * lisp/progmodes/cperl-mode.el: Remove old comments.
Diffstat (limited to 'lisp/vc/ediff-util.el')
| -rw-r--r-- | lisp/vc/ediff-util.el | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el index 549066e1eca..aea5f76d4fc 100644 --- a/lisp/vc/ediff-util.el +++ b/lisp/vc/ediff-util.el @@ -3277,16 +3277,14 @@ Hit \\[ediff-recenter] to reset the windows afterward." file)) -;; Quote metacharacters (using \) when executing diff in Unix, but not in -;; EMX OS/2 +;; Quote metacharacters (using \) when executing diff in Unix. ;;(defun ediff-protect-metachars (str) -;; (or (memq system-type '(emx)) -;; (let ((limit 0)) -;; (while (string-match ediff-metachars str limit) -;; (setq str (concat (substring str 0 (match-beginning 0)) -;; "\\" -;; (substring str (match-beginning 0)))) -;; (setq limit (1+ (match-end 0)))))) +;; (let ((limit 0)) +;; (while (string-match ediff-metachars str limit) +;; (setq str (concat (substring str 0 (match-beginning 0)) +;; "\\" +;; (substring str (match-beginning 0)))) +;; (setq limit (1+ (match-end 0))))) ;; str) ;; Make sure the current buffer (for a file) has the same contents as the @@ -4059,7 +4057,7 @@ interfaces to several other packages and runs under Emacs and XEmacs, byte-compilation may produce output like this: While compiling toplevel forms in file ediff.el: - ** reference to free variable pm-color-alist + ** reference to free variable zzz ........................ While compiling the end of the data: ** The following functions are not known to be defined: |