aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/mail
diff options
context:
space:
mode:
authorStefan Monnier2018-01-25 13:35:13 -0500
committerStefan Monnier2018-01-25 13:35:37 -0500
commit9107cf30c0c895bc4ea42810a22feee4af991157 (patch)
treed6574e36348178cfadc1fb5d09ca7bebc250f088 /lisp/mail
parentf44b50ffc957abb0fcda9b93f1bb7e2c8e9b3b0e (diff)
downloademacs-9107cf30c0c895bc4ea42810a22feee4af991157.tar.gz
emacs-9107cf30c0c895bc4ea42810a22feee4af991157.zip
Replace (default-value 'enable-multibyte-characters) with t
Since Emacs-24, (default-value 'enable-multibyte-characters) can't be changed any more, so we can remove all code which checks this value. * lisp/x-dnd.el (x-dnd-handle-file-name): * lisp/w32-fns.el (w32-set-default-process-coding-system): * lisp/textmodes/ispell.el (ispell-send-string): * lisp/term/internal.el (dos-codepage-setup): * lisp/tar-mode.el (tar-header-block-tokenize, tar--extract): * lisp/startup.el (command-line): * lisp/server.el (server-process-filter): * lisp/net/browse-url.el (browse-url-file-url): * lisp/menu-bar.el (menu-bar-options-menu, menu-bar-describe-menu): * lisp/mail/sendmail.el (mail-setup): * lisp/mail/rmail.el (rmail-mode, rmail-get-new-mail): * lisp/mail/rfc2047.el (rfc2047-encode-message-header): * lisp/mail/emacsbug.el (report-emacs-bug): * lisp/international/mule-diag.el (mule-diag): * lisp/files.el (find-file-noselect-1): * lisp/dos-fns.el (dos-set-default-process-coding-system): * lisp/arc-mode.el (archive-mode): * lisp/international/mule-cmds.el (mule-menu-keymap) (set-default-coding-systems, set-language-info) (set-language-environment, standard-display-european-internal) (set-locale-environment): Simplify code.
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/emacsbug.el5
-rw-r--r--lisp/mail/rfc2047.el24
-rw-r--r--lisp/mail/rmail.el5
-rw-r--r--lisp/mail/sendmail.el2
4 files changed, 14 insertions, 22 deletions
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index cb34a75fa1c..43e8d3b526c 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -286,11 +286,6 @@ usually do not have translators for other languages.\n\n")))
286 "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES" 286 "LC_ALL" "LC_COLLATE" "LC_CTYPE" "LC_MESSAGES"
287 "LC_MONETARY" "LC_NUMERIC" "LC_TIME" "LANG" "XMODIFIERS")) 287 "LC_MONETARY" "LC_NUMERIC" "LC_TIME" "LANG" "XMODIFIERS"))
288 (insert (format " locale-coding-system: %s\n" locale-coding-system)) 288 (insert (format " locale-coding-system: %s\n" locale-coding-system))
289 ;; Only ~ 0.2% of people from a sample of 3200 changed this from
290 ;; the default, t.
291 (or (default-value 'enable-multibyte-characters)
292 (insert (format " default enable-multibyte-characters: %s\n"
293 (default-value 'enable-multibyte-characters))))
294 (insert "\n") 289 (insert "\n")
295 (insert (format "Major mode: %s\n" 290 (insert (format "Major mode: %s\n"
296 (format-mode-line 291 (format-mode-line
diff --git a/lisp/mail/rfc2047.el b/lisp/mail/rfc2047.el
index dbfde57224a..c0cd4ee8c43 100644
--- a/lisp/mail/rfc2047.el
+++ b/lisp/mail/rfc2047.el
@@ -290,8 +290,7 @@ Should be called narrowed to the head of the message."
290 (let ((rfc2047-encoding-type 'mime)) 290 (let ((rfc2047-encoding-type 'mime))
291 (rfc2047-encode-region (point) (point-max)))) 291 (rfc2047-encode-region (point) (point-max))))
292 ((eq method 'default) 292 ((eq method 'default)
293 (if (and (default-value 'enable-multibyte-characters) 293 (if mail-parse-charset
294 mail-parse-charset)
295 (encode-coding-region (point) (point-max) 294 (encode-coding-region (point) (point-max)
296 mail-parse-charset))) 295 mail-parse-charset)))
297 ;; We get this when CC'ing messages to newsgroups with 296 ;; We get this when CC'ing messages to newsgroups with
@@ -305,18 +304,17 @@ Should be called narrowed to the head of the message."
305 ;; in accordance with changes elsewhere. 304 ;; in accordance with changes elsewhere.
306 ((null method) 305 ((null method)
307 (rfc2047-encode-region (point) (point-max))) 306 (rfc2047-encode-region (point) (point-max)))
308;;; ((null method) 307 ;; ((null method)
309;;; (if (or (message-options-get 308 ;; (if (or (message-options-get
310;;; 'rfc2047-encode-message-header-encode-any) 309 ;; 'rfc2047-encode-message-header-encode-any)
311;;; (message-options-set 310 ;; (message-options-set
312;;; 'rfc2047-encode-message-header-encode-any 311 ;; 'rfc2047-encode-message-header-encode-any
313;;; (y-or-n-p 312 ;; (y-or-n-p
314;;; "Some texts are not encoded. Encode anyway?"))) 313 ;; "Some texts are not encoded. Encode anyway?")))
315;;; (rfc2047-encode-region (point-min) (point-max)) 314 ;; (rfc2047-encode-region (point-min) (point-max))
316;;; (error "Cannot send unencoded text"))) 315 ;; (error "Cannot send unencoded text")))
317 ((mm-coding-system-p method) 316 ((mm-coding-system-p method)
318 (when (default-value 'enable-multibyte-characters) 317 (encode-coding-region (point) (point-max) method))
319 (encode-coding-region (point) (point-max) method)))
320 ;; Hm. 318 ;; Hm.
321 (t))) 319 (t)))
322 (goto-char (point-max)))))))) 320 (goto-char (point-max))))))))
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 7b542638743..4e182525511 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1331,8 +1331,7 @@ Instead, these commands are available:
1331 (let ((finding-rmail-file (not (eq major-mode 'rmail-mode)))) 1331 (let ((finding-rmail-file (not (eq major-mode 'rmail-mode))))
1332 (rmail-mode-2) 1332 (rmail-mode-2)
1333 (when (and finding-rmail-file 1333 (when (and finding-rmail-file
1334 (null coding-system-for-read) 1334 (null coding-system-for-read))
1335 (default-value 'enable-multibyte-characters))
1336 (let ((rmail-enable-multibyte t)) 1335 (let ((rmail-enable-multibyte t))
1337 (rmail-require-mime-maybe) 1336 (rmail-require-mime-maybe)
1338 (rmail-convert-file-maybe) 1337 (rmail-convert-file-maybe)
@@ -1759,7 +1758,7 @@ not be a new one). It returns non-nil if it got any new messages."
1759 (or (eq buffer-undo-list t) 1758 (or (eq buffer-undo-list t)
1760 (setq buffer-undo-list nil)) 1759 (setq buffer-undo-list nil))
1761 (let ((all-files (if file-name (list file-name) rmail-inbox-list)) 1760 (let ((all-files (if file-name (list file-name) rmail-inbox-list))
1762 (rmail-enable-multibyte (default-value 'enable-multibyte-characters)) 1761 (rmail-enable-multibyte t)
1763 found) 1762 found)
1764 (unwind-protect 1763 (unwind-protect
1765 (progn 1764 (progn
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index da2d3174ce1..212a6c74baa 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -607,7 +607,7 @@ This also saves the value of `send-mail-function' via Customize."
607 (kill-local-variable 'buffer-file-coding-system) 607 (kill-local-variable 'buffer-file-coding-system)
608 ;; This doesn't work for enable-multibyte-characters. 608 ;; This doesn't work for enable-multibyte-characters.
609 ;; (kill-local-variable 'enable-multibyte-characters) 609 ;; (kill-local-variable 'enable-multibyte-characters)
610 (set-buffer-multibyte (default-value 'enable-multibyte-characters)) 610 (set-buffer-multibyte t)
611 (if current-input-method 611 (if current-input-method
612 (deactivate-input-method)) 612 (deactivate-input-method))
613 613