Now on revision 106637. ------------------------------------------------------------ revno: 106637 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-12-08 06:22:03 +0000 message: gnus-sum.el (gnus-summary-show-article): Don't load shr unconditionally. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-12-07 06:07:53 +0000 +++ lisp/gnus/ChangeLog 2011-12-08 06:22:03 +0000 @@ -1,3 +1,8 @@ +2011-12-08 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-show-article): Don't load shr + unconditionally. + 2011-12-07 Katsumi Yamaoka * message.el (message-pop-to-buffer): Use pop-to-buffer instead of === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-12-06 01:30:54 +0000 +++ lisp/gnus/gnus-sum.el 2011-12-08 06:22:03 +0000 @@ -9611,9 +9611,12 @@ (when (gnus-summary-goto-subject (cdr gnus-article-current) nil t) (gnus-summary-update-secondary-mark (cdr gnus-article-current)))))) ((not arg) - (require 'shr) - (let ((shr-ignore-cache t)) - ;; Select the article the normal way. + ;; Select the article the normal way. + (if (eq mm-text-html-renderer 'shr) + (progn + (require 'shr) + (let ((shr-ignore-cache t)) + (gnus-summary-select-article nil 'force))) (gnus-summary-select-article nil 'force))) ((equal arg '(16)) ;; C-u C-u g ------------------------------------------------------------ revno: 106636 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Thu 2011-12-08 14:57:00 +0900 message: coding.c (encode_coding_ccl): Check (charbuf < charbuf_end) after the loop to call ccl_driver at least once. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-12-08 02:34:09 +0000 +++ src/ChangeLog 2011-12-08 05:54:20 +0000 @@ -1,3 +1,8 @@ +2011-12-08 Kazuhiro Ito (tiny change) + + * coding.c (encode_coding_ccl): Check (charbuf < charbuf_end) + after the loop to call ccl_driver at least once. + 2011-12-08 Kenichi Handa * ftfont.c (get_adstyle_property): Fix previous change === modified file 'src/coding.c' --- src/coding.c 2011-12-05 09:05:10 +0000 +++ src/coding.c 2011-12-08 05:54:20 +0000 @@ -5244,7 +5244,7 @@ && coding->mode & CODING_MODE_LAST_BLOCK) ccl->last_block = 1; - while (charbuf < charbuf_end) + do { ccl_driver (ccl, charbuf, destination_charbuf, charbuf_end - charbuf, 1024, charset_list); @@ -5266,6 +5266,7 @@ || ccl->status == CCL_STAT_INVALID_CMD) break; } + while (charbuf < charbuf_end); switch (ccl->status) { ------------------------------------------------------------ revno: 106635 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Thu 2011-12-08 11:34:47 +0900 message: ftfont.c (get_adstyle_property): Fix previous change (Bug#10233). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-12-07 23:14:13 +0000 +++ src/ChangeLog 2011-12-08 02:34:09 +0000 @@ -1,3 +1,8 @@ +2011-12-08 Kenichi Handa + + * ftfont.c (get_adstyle_property): Fix previous change + (Bug#10233). + 2011-12-07 Juanma Barranquero * w32.c (init_environment): If no_site_lisp, remove site-lisp === modified file 'src/ftfont.c' --- src/ftfont.c 2011-12-05 07:48:29 +0000 +++ src/ftfont.c 2011-12-08 02:34:09 +0000 @@ -166,8 +166,8 @@ #ifdef FC_FONTFORMAT if ((FcPatternGetString (p, FC_FONTFORMAT, 0, &fcstr) == FcResultMatch) - && (xstrcasecmp ((char *) fcstr, "bdf") != 0 - || xstrcasecmp ((char *) fcstr, "pcf") != 0)) + && xstrcasecmp ((char *) fcstr, "bdf") != 0 + && xstrcasecmp ((char *) fcstr, "pcf") != 0) /* Not a BDF nor PCF font. */ return Qnil; #endif ------------------------------------------------------------ revno: 106634 fixes bug(s): http://debbugs.gnu.org/10208 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2011-12-08 00:14:13 +0100 message: src/w32.c: Implement --no-site-lisp on Windows (bug#10208). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-12-07 02:16:53 +0000 +++ src/ChangeLog 2011-12-07 23:14:13 +0000 @@ -1,3 +1,8 @@ +2011-12-07 Juanma Barranquero + + * w32.c (init_environment): If no_site_lisp, remove site-lisp + dirs from the default value of EMACSLOADPATH (bug#10208). + 2011-12-07 Glenn Morris * lread.c (init_lread): If no_site_lisp, exclude site-lisp/ in === modified file 'src/w32.c' --- src/w32.c 2011-11-20 02:29:42 +0000 +++ src/w32.c 2011-12-07 23:14:13 +0000 @@ -1654,6 +1654,24 @@ } } + /* When Emacs is invoked with --no-site-lisp, we must remove the + site-lisp directories from the default value of EMACSLOADPATH. + This assumes that the site-lisp entries are at the front, and + that additional entries do exist. */ + if (no_site_lisp) + { + for (i = 0; i < N_ENV_VARS; i++) + { + if (strcmp (env_vars[i].name, "EMACSLOADPATH") == 0) + { + char *site; + while ((site = strstr (env_vars[i].def_value, "site-lisp"))) + env_vars[i].def_value = strchr (site, ';') + 1; + break; + } + } + } + #define SET_ENV_BUF_SIZE (4 * MAX_PATH) /* to cover EMACSLOADPATH */ /* Treat emacs_dir specially: set it unconditionally based on our ------------------------------------------------------------ revno: 106633 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-12-07 06:07:53 +0000 message: message.el (message-pop-to-buffer): Use pop-to-buffer instead of pop-to-buffer-same-window for old Emacsen. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-12-04 08:02:42 +0000 +++ lisp/gnus/ChangeLog 2011-12-07 06:07:53 +0000 @@ -1,3 +1,8 @@ +2011-12-07 Katsumi Yamaoka + + * message.el (message-pop-to-buffer): Use pop-to-buffer instead of + pop-to-buffer-same-window for old Emacsen. + 2011-12-04 Chong Yidong * message.el (message-pop-to-buffer): Partially revert 2011-11-30 === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-12-04 08:02:42 +0000 +++ lisp/gnus/message.el 2011-12-07 06:07:53 +0000 @@ -6344,7 +6344,11 @@ "Message already being composed; erase? ") (message nil)))) (error "Message being composed"))) - (funcall (or switch-function #'pop-to-buffer-same-window) name) + (funcall (or switch-function + (if (fboundp #'pop-to-buffer-same-window) + #'pop-to-buffer-same-window + #'pop-to-buffer)) + name) (set-buffer name)) (erase-buffer) (message-mode))) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.