diff options
author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-12 15:02:32 +1100 |
---|---|---|
committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-12 15:02:32 +1100 |
commit | 9f7711815b808d69f74af93c5a7a36ae6a73900c (patch) | |
tree | 18a9a7d30cf5a2ebaa6f22ded99f9d54e81a30bd /lisp/gnus/nnheader.el | |
parent | 37cf4454b1646481935e7b5bfffc8f64eb484b3a (diff) | |
download | emacs-9f7711815b808d69f74af93c5a7a36ae6a73900c.tar.gz emacs-9f7711815b808d69f74af93c5a7a36ae6a73900c.tar.bz2 emacs-9f7711815b808d69f74af93c5a7a36ae6a73900c.zip |
Remove XEmacs compat code from Gnus backends
* lisp/gnus/mm-view.el (mm-inline-image-xemacs): Remove.
(mm-inline-image): Rename from mm-inline-image-emacs.
* lisp/gnus/mml.el: Remove XEmacs compat code.
* lisp/gnus/nnheader.el: Remove XEmacs compat code.
* lisp/gnus/nnimap.el (nnimap-open-connection-1): Remove
XEmacs compat code.
* lisp/gnus/nnir.el (nnir-run-gmane): Remove XEmacs compat code.
* lisp/gnus/nnmail.el (nnmail-pathname-coding-system): Remove
XEmacs compat code.
* lisp/gnus/nnmairix.el: Remove XEmacs compat code.
* lisp/gnus/nnrss.el: Remove XEmacs compat code.
* lisp/gnus/nntp.el: Remove XEmacs compat code.
Diffstat (limited to 'lisp/gnus/nnheader.el')
-rw-r--r-- | lisp/gnus/nnheader.el | 49 |
1 files changed, 11 insertions, 38 deletions
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el index c8c95f00117..42dfcb30006 100644 --- a/lisp/gnus/nnheader.el +++ b/lisp/gnus/nnheader.el @@ -726,9 +726,7 @@ the line could be found." (string-match nnheader-numerical-short-files file) (string-to-number (match-string 0 file)))) -(defvar nnheader-directory-files-is-safe - (or (eq system-type 'windows-nt) - (not (featurep 'xemacs))) +(defvar nnheader-directory-files-is-safe (not (eq system-type 'windows-nt)) "If non-nil, Gnus believes `directory-files' is safe. It has been reported numerous times that `directory-files' fails with an alarming frequency on NFS mounted file systems. If it is nil, @@ -780,28 +778,8 @@ If FULL, translate everything." 2 0)) ;; We translate -- but only the file name. We leave the directory ;; alone. - (if (and (featurep 'xemacs) - (memq system-type '(windows-nt cygwin))) - ;; This is needed on NT and stuff, because - ;; file-name-nondirectory is not enough to split - ;; file names, containing ':', e.g. - ;; "d:\\Work\\News\\nntp+news.fido7.ru:fido7.ru.gnu.SCORE" - ;; - ;; we are trying to correctly split such names: - ;; "d:file.name" -> "a:" "file.name" - ;; "aaa:bbb.ccc" -> "" "aaa:bbb.ccc" - ;; "d:aaa\\bbb:ccc" -> "d:aaa\\" "bbb:ccc" - ;; etc. - ;; to translate then only the file name part. - (progn - (setq leaf file - path "") - (if (string-match "\\(^\\w:\\|[/\\]\\)\\([^/\\]+\\)$" file) - (setq leaf (substring file (match-beginning 2)) - path (substring file 0 (match-beginning 2))))) - ;; Emacs DTRT, says andrewi. - (setq leaf (file-name-nondirectory file) - path (file-name-directory file)))) + (setq leaf (file-name-nondirectory file) + path (file-name-directory file))) (setq len (length leaf)) (while (< i len) (when (setq trans (cdr (assq (aref leaf i) @@ -1098,16 +1076,14 @@ See `find-file-noselect' for the arguments." (defmacro nnheader-insert-buffer-substring (buffer &optional start end) "Copy string from unibyte buffer to multibyte current buffer." - (if (featurep 'xemacs) - `(insert-buffer-substring ,buffer ,start ,end) - `(if enable-multibyte-characters - (insert (with-current-buffer ,buffer - (string-to-multibyte - ,(if (or start end) - `(buffer-substring (or ,start (point-min)) - (or ,end (point-max))) - '(buffer-string))))) - (insert-buffer-substring ,buffer ,start ,end)))) + `(if enable-multibyte-characters + (insert (with-current-buffer ,buffer + (string-to-multibyte + ,(if (or start end) + `(buffer-substring (or ,start (point-min)) + (or ,end (point-max))) + '(buffer-string))))) + (insert-buffer-substring ,buffer ,start ,end))) (defvar nnheader-last-message-time '(0 0)) (defun nnheader-message-maybe (&rest args) @@ -1116,9 +1092,6 @@ See `find-file-noselect' for the arguments." (setq nnheader-last-message-time now) (apply 'nnheader-message args)))) -(when (featurep 'xemacs) - (require 'nnheaderxm)) - (run-hooks 'nnheader-load-hook) (provide 'nnheader) |