diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/gnus/nnmaildir.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/shr.el | 4 | ||||
| -rw-r--r-- | lisp/international/mule-cmds.el | 10 |
5 files changed, 25 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ddc8f9b5a7e..30bdefac5bf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-06-13 Glenn Morris <rgm@gnu.org> + + * international/mule-cmds.el (mule-menu-keymap) + (set-language-environment, set-locale-environment): Doc tweaks. + 2012-06-16 Aurelien Aptel <aurelien.aptel@gmail.com> * cus-face.el (custom-face-attributes): Add wave-style underline diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index b86b4a76e30..bce4e4a1800 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,13 @@ +2012-06-10 Toke Høiland-Jørgensen <toke@toke.dk> (tiny change) + + * nnmaildir.el (nnmaildir-request-expire-articles): Ensure that `time' + is an integer to avoid later problems. + +2012-06-10 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * shr.el: Add a iso-8859-1 cookie to make stuff work under other + locales. + 2012-04-14 Wolfgang Jenkner <wjenkner@inode.at> * gnus-agent.el (gnus-agent-retrieve-headers): Recalculate the range of diff --git a/lisp/gnus/nnmaildir.el b/lisp/gnus/nnmaildir.el index bbace7c784a..7139a528e11 100644 --- a/lisp/gnus/nnmaildir.el +++ b/lisp/gnus/nnmaildir.el @@ -1461,7 +1461,7 @@ by nnmaildir-request-article.") (if (eq time 'immediate) (setq time 0) (if (numberp time) - (setq time (* time 86400))))) + (setq time (round (* time 86400)))))) (when no-force (unless (integerp time) ;; handle 'never (throw 'return (gnus-uncompress-range ranges))) diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el index c2040a9b8cf..42118298734 100644 --- a/lisp/gnus/shr.el +++ b/lisp/gnus/shr.el @@ -1393,4 +1393,8 @@ ones, in case fg and bg are nil." (provide 'shr) +;; Local Variables: +;; coding: iso-8859-1 +;; End: + ;;; shr.el ends here diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 6ec5e2302a2..0f3d8c2d2bf 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -129,10 +129,10 @@ `(menu-item ,(purecopy "Set Coding Systems") ,set-coding-system-map :enable (default-value 'enable-multibyte-characters))) (define-key-after map [view-hello-file] - `(menu-item ,(purecopy "Show Multi-lingual Text") view-hello-file + `(menu-item ,(purecopy "Show Multilingual Sample Text") view-hello-file :enable (file-readable-p (expand-file-name "HELLO" data-directory)) - :help ,(purecopy "Display file which says HELLO in many languages"))) + :help ,(purecopy "Demonstrate various character sets"))) (define-key-after map [separator-coding-system] menu-bar-separator) (define-key-after map [describe-language-environment] @@ -148,7 +148,7 @@ `(menu-item ,(purecopy "List Character Sets") list-character-sets :help ,(purecopy "Show table of available character sets"))) (define-key-after map [mule-diag] - `(menu-item ,(purecopy "Show All of Mule Status") mule-diag + `(menu-item ,(purecopy "Show All Multilingual Settings") mule-diag :help ,(purecopy "Display multilingual environment settings"))) map) "Keymap for Mule (Multilingual environment) menu specific commands.") @@ -1828,7 +1828,7 @@ The default status is as follows: (set-terminal-coding-system (or coding-system coding) display))) (defun set-language-environment (language-name) - "Set up multi-lingual environment for using LANGUAGE-NAME. + "Set up multilingual environment for using LANGUAGE-NAME. This sets the coding system priority and the default input method and sometimes other things. LANGUAGE-NAME should be a string which is the name of a language environment. For example, \"Latin-1\" @@ -2500,7 +2500,7 @@ For example, translate \"swedish\" into \"sv_SE.ISO8859-1\"." locale)) (defun set-locale-environment (&optional locale-name frame) - "Set up multi-lingual environment for using LOCALE-NAME. + "Set up multilingual environment for using LOCALE-NAME. This sets the language environment, the coding system priority, the default input method and sometimes other things. |