Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99397. ------------------------------------------------------------ revno: 99397 committer: YAMAMOTO Mitsuharu branch nick: trunk timestamp: Sat 2010-01-23 14:20:38 +0900 message: * xdisp.c (draw_glyphs): Update `start' for left_overwritten case as in Emacs 22. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-22 09:10:04 +0000 +++ src/ChangeLog 2010-01-23 05:20:38 +0000 @@ -1,3 +1,8 @@ +2010-01-23 YAMAMOTO Mitsuharu + + * xdisp.c (draw_glyphs): Update `start' for left_overwritten case + as in Emacs 22. + 2010-01-22 YAMAMOTO Mitsuharu * lisp.h (make_pure_string): String pointer arg now points to const. === modified file 'src/xdisp.c' --- src/xdisp.c 2010-01-16 11:58:42 +0000 +++ src/xdisp.c 2010-01-23 05:20:38 +0000 @@ -20401,6 +20401,7 @@ j = i; BUILD_GLYPH_STRINGS (j, start, h, t, overlap_hl, dummy_x, last_x); + start = i; compute_overhangs_and_x (t, head->x, 1); prepend_glyph_string_lists (&head, &tail, h, t); clip_head = head; @@ -20450,6 +20451,8 @@ BUILD_GLYPH_STRINGS (end, i, h, t, overlap_hl, x, last_x); + /* Because BUILD_GLYPH_STRINGS updates the first argument, + we don't have `end = i;' here. */ compute_overhangs_and_x (h, tail->x + tail->width, 0); append_glyph_string_lists (&head, &tail, h, t); clip_tail = tail; ------------------------------------------------------------ revno: 99396 committer: Michael Albinus branch nick: trunk timestamp: Fri 2010-01-22 22:19:50 +0100 message: * net/tramp-imap.el (top): Autoload needed packages. diff: === modified file 'lisp/net/tramp-imap.el' --- lisp/net/tramp-imap.el 2010-01-22 21:17:11 +0000 +++ lisp/net/tramp-imap.el 2010-01-22 21:19:50 +0000 @@ -55,7 +55,6 @@ (require 'assoc) (require 'tramp) (require 'tramp-compat) -(eval-when-compile (require 'imap-hash)) (autoload 'auth-source-user-or-password "auth-source") (autoload 'epg-context-operation "epg") ------------------------------------------------------------ revno: 99395 committer: Michael Albinus branch nick: trunk timestamp: Fri 2010-01-22 22:17:11 +0100 message: * net/tramp-imap.el (top): Autoload needed packages. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-22 16:43:54 +0000 +++ lisp/ChangeLog 2010-01-22 21:17:11 +0000 @@ -1,3 +1,7 @@ +2010-01-22 Michael Albinus + + * net/tramp-imap.el (top): Autoload needed packages. + 2010-01-22 Stefan Monnier * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte === modified file 'lisp/net/tramp-imap.el' --- lisp/net/tramp-imap.el 2010-01-13 08:35:10 +0000 +++ lisp/net/tramp-imap.el 2010-01-22 21:17:11 +0000 @@ -55,13 +55,24 @@ (require 'assoc) (require 'tramp) (require 'tramp-compat) -(require 'message) -(require 'imap-hash) -(require 'epa) +(eval-when-compile (require 'imap-hash)) + (autoload 'auth-source-user-or-password "auth-source") +(autoload 'epg-context-operation "epg") +(autoload 'epg-context-set-armor "epg") +(autoload 'epg-context-set-passphrase-callback "epg") +(autoload 'epg-context-set-progress-callback "epg") +(autoload 'epg-decrypt-string "epg") +(autoload 'epg-encrypt-string "epg") +(autoload 'imap-hash-get "imap-hash") +(autoload 'imap-hash-make "imap-hash") +(autoload 'imap-hash-map "imap-hash") +(autoload 'imap-hash-put "imap-hash") +(autoload 'imap-hash-rem "imap-hash") ;; We use the additional header "X-Size" for encoding the size of a file. -(add-to-list 'imap-hash-headers 'X-Size 'append) +(eval-after-load "imap-hash" + '(add-to-list 'imap-hash-headers 'X-Size 'append)) ;; Define Tramp IMAP method ... (defconst tramp-imap-method "imap" @@ -662,7 +673,8 @@ (read-passwd (if (eq key-id 'PIN) "Tramp-IMAP passphrase for PIN: " - (let ((entry (assoc key-id epg-user-id-alist))) + (let ((entry (assoc key-id + (symbol-value 'epg-user-id-alist)))) (if entry (format "Tramp-IMAP passphrase for %s %s: " key-id (cdr entry)) ------------------------------------------------------------ revno: 99394 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2010-01-22 11:43:54 -0500 message: * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte just because we see "encoding: 8bit". * mail/rmail.el (rmail-show-message-1): Decode the body's QP into bytes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-22 16:32:31 +0000 +++ lisp/ChangeLog 2010-01-22 16:43:54 +0000 @@ -1,3 +1,9 @@ +2010-01-22 Stefan Monnier + + * mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte + just because we see "encoding: 8bit". + * mail/rmail.el (rmail-show-message-1): Decode the body's QP into bytes. + 2010-01-22 Chong Yidong * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446). === modified file 'lisp/mail/mail-utils.el' --- lisp/mail/mail-utils.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/mail-utils.el 2010-01-22 16:43:54 +0000 @@ -133,6 +133,8 @@ If UNIBYTE is non-nil, insert converted characters as unibyte. That is useful if you are going to character code decoding afterward, as Rmail does." + ;; FIXME: `unibyte' should always be non-nil, and the iso-latin-1 + ;; specific handling should be removed (or moved elsewhere and generalized). (interactive "r\nP") (let (failed) (save-match-data === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2010-01-13 12:34:53 +0000 +++ lisp/mail/rmail.el 2010-01-22 16:43:54 +0000 @@ -2727,7 +2727,8 @@ (insert-buffer-substring mbox-buf body-start end) (cond ((string= character-coding "quoted-printable") - (mail-unquote-printable-region (point-min) (point-max))) + (mail-unquote-printable-region (point-min) (point-max) + nil nil 'unibyte)) ((and (string= character-coding "base64") is-text-message) (base64-decode-region (point-min) (point-max))) ((eq character-coding 'uuencode) === modified file 'lisp/mail/rmailmm.el' --- lisp/mail/rmailmm.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/rmailmm.el 2010-01-22 16:43:54 +0000 @@ -361,7 +361,10 @@ (setq content-transfer-encoding nil)) ((string= content-transfer-encoding "8bit") ;; FIXME: Is this the correct way? - (set-buffer-multibyte nil))) + ;; No, of course not, it just means there's no decoding to do. + ;; (set-buffer-multibyte nil) + (setq content-transfer-encoding nil) + )) ;; Inline stuff requires work. Attachments are handled by the bulk ;; handler. (if (string= "inline" (car content-disposition)) ------------------------------------------------------------ revno: 99393 committer: Chong Yidong branch nick: trunk timestamp: Fri 2010-01-22 11:32:31 -0500 message: * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-22 10:23:25 +0000 +++ lisp/ChangeLog 2010-01-22 16:32:31 +0000 @@ -1,3 +1,7 @@ +2010-01-22 Chong Yidong + + * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446). + 2010-01-22 Eli Zaretskii * jka-compr.el (jka-compr-load): If load-file is not in === modified file 'lisp/isearch.el' --- lisp/isearch.el 2010-01-13 08:35:10 +0000 +++ lisp/isearch.el 2010-01-22 16:32:31 +0000 @@ -1754,7 +1754,10 @@ (put 'digit-argument 'isearch-scroll t) (defcustom isearch-allow-scroll nil - "If non-nil, scrolling commands are allowed during incremental search." + "Whether scrolling is allowed during incremental search. +If non-nil, scrolling commands can be used in Isearch mode. +However, the current match will never scroll offscreen. +If nil, scolling commands will first cancel Isearch mode." :type 'boolean :group 'isearch) ------------------------------------------------------------ revno: 99392 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2010-01-22 12:23:25 +0200 message: Fix bug #5447, whereby loading C:/foo.el.gz on MS-Windows would fail. jka-compr.el (jka-compr-load): If load-file is not in load-history, try its file-truename version. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-21 21:45:01 +0000 +++ lisp/ChangeLog 2010-01-22 10:23:25 +0000 @@ -1,3 +1,8 @@ +2010-01-22 Eli Zaretskii + + * jka-compr.el (jka-compr-load): If load-file is not in + load-history, try its file-truename version. (bug#5447) + 2010-01-21 Alan Mackenzie Fix a situation where deletion of a cpp construct throws an error. === modified file 'lisp/jka-compr.el' --- lisp/jka-compr.el 2010-01-13 08:35:10 +0000 +++ lisp/jka-compr.el 2010-01-22 10:23:25 +0000 @@ -590,7 +590,14 @@ (or nomessage (message "Loading %s...done." file)) ;; Fix up the load history to point at the right library. - (let ((l (assoc load-file load-history))) + (let ((l (or (assoc load-file load-history) + ;; On MS-Windows, if load-file is in + ;; temporary-file-directory, it will look like + ;; "c:/DOCUME~1/USER/LOCALS~1/foo", whereas + ;; readevalloop will record its truename in + ;; load-history. Therefore try truename if the + ;; original name is not in load-history. + (assoc (file-truename load-file) load-history)))) ;; Remove .gz and .elc?. (while (file-name-extension file) (setq file (file-name-sans-extension file))) ------------------------------------------------------------ revno: 99391 committer: YAMAMOTO Mitsuharu branch nick: trunk timestamp: Fri 2010-01-22 18:10:04 +0900 message: Make string pointer args point to const as in other string allocation functions. * lisp.h (make_pure_string): String pointer arg now points to const. * alloc.c (find_string_data_in_pure, make_pure_string): String pointer args now point to const. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-22 08:44:50 +0000 +++ src/ChangeLog 2010-01-22 09:10:04 +0000 @@ -1,3 +1,10 @@ +2010-01-22 YAMAMOTO Mitsuharu + + * lisp.h (make_pure_string): String pointer arg now points to const. + + * alloc.c (find_string_data_in_pure, make_pure_string): String pointer + args now point to const. + 2010-01-22 Eli Zaretskii * lread.c (Fload): Don't treat files without .elc extension as === modified file 'src/alloc.c' --- src/alloc.c 2010-01-13 08:35:10 +0000 +++ src/alloc.c 2010-01-22 09:10:04 +0000 @@ -4725,11 +4725,11 @@ static char * find_string_data_in_pure (data, nbytes) - char *data; + const char *data; int nbytes; { int i, skip, bm_skip[256], last_char_skip, infinity, start, start_max; - unsigned char *p; + const unsigned char *p; char *non_lisp_beg; if (pure_bytes_used_non_lisp < nbytes + 1) @@ -4740,7 +4740,7 @@ for (i = 0; i < 256; i++) bm_skip[i] = skip; - p = (unsigned char *) data; + p = (const unsigned char *) data; while (--skip > 0) bm_skip[*p++] = skip; @@ -4754,7 +4754,7 @@ infinity = pure_bytes_used_non_lisp + 1; bm_skip['\0'] = infinity; - p = (unsigned char *) non_lisp_beg + nbytes; + p = (const unsigned char *) non_lisp_beg + nbytes; start = 0; do { @@ -4796,7 +4796,7 @@ Lisp_Object make_pure_string (data, nchars, nbytes, multibyte) - char *data; + const char *data; int nchars, nbytes; int multibyte; { === modified file 'src/lisp.h' --- src/lisp.h 2010-01-13 08:35:10 +0000 +++ src/lisp.h 2010-01-22 09:10:04 +0000 @@ -2686,7 +2686,7 @@ extern Lisp_Object make_string_from_bytes P_ ((const char *, int, int)); extern Lisp_Object make_specified_string P_ ((const char *, int, int, int)); EXFUN (Fpurecopy, 1); -extern Lisp_Object make_pure_string P_ ((char *, int, int, int)); +extern Lisp_Object make_pure_string P_ ((const char *, int, int, int)); extern Lisp_Object make_pure_c_string (const char *data); extern Lisp_Object pure_cons P_ ((Lisp_Object, Lisp_Object)); extern Lisp_Object make_pure_vector P_ ((EMACS_INT)); ------------------------------------------------------------ revno: 99390 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2010-01-22 10:44:50 +0200 message: Fix bug #5303 in `load' on MS-Windows, whereby load-file would fail for files like C:/the-file.el in root directory of any drive. lread.c (Fload): Don't treat files without .elc extension as byte-compiled if they are ``magic'', i.e. `openp' returned -2 for them. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-20 02:33:52 +0000 +++ src/ChangeLog 2010-01-22 08:44:50 +0000 @@ -1,3 +1,9 @@ +2010-01-22 Eli Zaretskii + + * lread.c (Fload): Don't treat files without .elc extension as + byte-compiled if they are ``magic'', i.e. `openp' returned -2 for + them. (bug#5303) + 2010-01-20 Kenichi Handa * coding.c (consume_chars): If ! multibyte and the encoder is ccl, === modified file 'src/lread.c' --- src/lread.c 2010-01-13 08:35:10 +0000 +++ src/lread.c 2010-01-22 08:44:50 +0000 @@ -1155,7 +1155,7 @@ if (!bcmp (SDATA (found) + SBYTES (found) - 4, ".elc", 4) - || (version = safe_to_load_p (fd)) > 0) + || (fd >= 0 && (version = safe_to_load_p (fd)) > 0)) /* Load .elc files directly, but not when they are remote and have no handler! */ { ------------------------------------------------------------ revno: 99389 committer: Alan Mackenzie branch nick: trunk timestamp: Thu 2010-01-21 21:45:01 +0000 message: Fix a situation where deletion of a cpp construct throws an error. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-21 14:03:10 +0000 +++ lisp/ChangeLog 2010-01-21 21:45:01 +0000 @@ -1,3 +1,11 @@ +2010-01-21 Alan Mackenzie + + Fix a situation where deletion of a cpp construct throws an error. + * progmodes/cc-engine.el (c-invalidate-state-cache): Before + invoking c-with-all-but-one-cpps-commented-out, check that the + special cpp construct is still in the buffer. + (c-parse-state): Record the special cpp with markers, not numbers. + 2010-01-21 Kenichi Handa * textmodes/sgml-mode.el (sgml-maybe-name-self): No need to === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2010-01-14 18:37:23 +0000 +++ lisp/progmodes/cc-engine.el 2010-01-21 21:45:01 +0000 @@ -2996,9 +2996,11 @@ ;; containing point. We can then call `c-invalidate-state-cache-1' without ;; worrying further about macros and template delimiters. (c-with-<->-as-parens-suppressed - (if c-state-old-cpp-beg + (if (and c-state-old-cpp-beg + (< c-state-old-cpp-beg here)) (c-with-all-but-one-cpps-commented-out - c-state-old-cpp-beg c-state-old-cpp-end + c-state-old-cpp-beg + (min c-state-old-cpp-end here) (c-invalidate-state-cache-1 here)) (c-with-cpps-commented-out (c-invalidate-state-cache-1 here))))) @@ -3029,8 +3031,9 @@ (c-parse-state-1)) (c-with-cpps-commented-out (c-parse-state-1)))) - (setq c-state-old-cpp-beg here-cpp-beg - c-state-old-cpp-end here-cpp-end)))) + (setq c-state-old-cpp-beg (and here-cpp-beg (copy-marker here-cpp-beg t)) + c-state-old-cpp-end (and here-cpp-end (copy-marker here-cpp-end t))) + ))) ;; Debug tool to catch cache inconsistencies. This is called from ;; 000tests.el. ------------------------------------------------------------ revno: 99388 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-01-21 09:03:10 -0500 message: Fix sgml-maybe-name-self (Bug#5380). * textmodes/sgml-mode.el (sgml-maybe-name-self): No need to process last-command-event, as it is now decoded first (Bug#5380). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-20 17:14:37 +0000 +++ lisp/ChangeLog 2010-01-21 14:03:10 +0000 @@ -1,3 +1,8 @@ +2010-01-21 Kenichi Handa + + * textmodes/sgml-mode.el (sgml-maybe-name-self): No need to + process last-command-event, as it is now decoded first (Bug#5380). + 2010-01-20 Chong Yidong * term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330). === modified file 'lisp/textmodes/sgml-mode.el' --- lisp/textmodes/sgml-mode.el 2010-01-13 08:35:10 +0000 +++ lisp/textmodes/sgml-mode.el 2010-01-21 14:03:10 +0000 @@ -608,11 +608,7 @@ "Insert a symbolic character name according to `sgml-char-names'." (interactive "*") (if sgml-name-8bit-mode - (let ((mc last-command-event)) - (if (< mc 256) - (setq mc (unibyte-char-to-multibyte mc))) - (or mc (setq mc last-command-event)) - (sgml-name-char mc)) + (sgml-name-char last-command-event) (self-insert-command 1))) (defun sgml-name-8bit-mode () ------------------------------------------------------------ revno: 99387 [merge] committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-01-21 09:07:49 +0000 message: (Score File Format): Fix typo. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-01-18 03:54:24 +0000 +++ doc/misc/ChangeLog 2010-01-21 09:05:08 +0000 @@ -1,3 +1,7 @@ +2010-01-21 Katsumi Yamaoka + + * gnus.texi (Score File Format): Fix typo. + 2010-01-18 Juanma Barranquero * ada-mode.texi (Project File Overview): Fix typo. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-01-04 18:18:38 +0000 +++ doc/misc/gnus.texi 2010-01-21 09:05:08 +0000 @@ -21803,7 +21803,7 @@ other. @item eval -The value of this entry will be @code{eval}el. This element will be +The value of this entry will be @code{eval}ed. This element will be ignored when handling global score files. @item read-only ------------------------------------------------------------ revno: 99386 committer: Glenn Morris branch nick: trunk timestamp: Wed 2010-01-20 20:37:44 -0800 message: (Bugs): Fix PROBLEMS keybinding. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-01-13 15:38:28 +0000 +++ doc/emacs/ChangeLog 2010-01-21 04:37:44 +0000 @@ -1,3 +1,7 @@ +2010-01-21 Glenn Morris + + * trouble.texi (Bugs): Fix PROBLEMS keybinding. + 2010-01-12 Glenn Morris * trouble.texi (Checklist): Use bug-gnu-emacs rather than === modified file 'doc/emacs/trouble.texi' --- doc/emacs/trouble.texi 2010-01-12 05:11:05 +0000 +++ doc/emacs/trouble.texi 2010-01-21 04:37:44 +0000 @@ -419,7 +419,7 @@ Before reporting a bug, it is a good idea to see if it is already known. You can find the list of known problems in the file -@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-e} to read +@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-p} to read it. Some additional user-level problems can be found in @ref{Bugs and problems, , Bugs and problems, efaq, GNU Emacs FAQ}. Looking up your problem in these two documents might provide you with a solution or a ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.