From: Glenn Morris Date: Wed, 23 Feb 2011 04:19:28 +0000 (-0800) Subject: Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~754 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cce7d53002e8abc346b67ea4100507b0e7c4d68e;p=emacs.git Merge from emacs-23; up to 2010-06-02T00:10:42Z!yamaoka@jpl.org. --- cce7d53002e8abc346b67ea4100507b0e7c4d68e diff --cc admin/ChangeLog index 87ba151dc34,d0e7b78f2e8..f2c16b42e23 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,88 -1,8 +1,92 @@@ -2011-02-22 Juanma Barranquero ++2011-02-23 Juanma Barranquero + + * notes/bugtracker (bugtracker_debbugs_url): Fix typo. + -2011-01-03 Glenn Morris +2011-02-19 Eli Zaretskii + + * admin.el (set-version): Add msdos/sed2v2.inp. + +2011-02-16 Paul Eggert + + Remove no-longer needed getloadavg symbols. + * CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE): + (LDAV_SYMBOL): Remove. + +2011-02-12 Glenn Morris + + * bzrmerge.el (bzrmerge-resolve): Fix bzr revert call. + +2011-02-05 Glenn Morris + + * bzrmerge.el (bzrmerge-warning-buffer): New constant. + (bzrmerge-apply): Use it. + (bzrmerge): Kill any old warning buffer first. + +2011-02-03 Glenn Morris + + * bzrmerge.el (bzrmerge-buffer): New constant. + (bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it. + (bzrmerge-missing): If nothing to do, return nil not (nil). + (bzrmerge-apply): Remove odd character from message. + (bzrmerge): Give status messages. + +2011-01-31 Eli Zaretskii + + * admin.el (set-version): Remove lib-src/makefile.w32-in. + Add nt/config.nt. + +2011-01-31 Paul Eggert + + src/emacs.c now gets version number from configure.in + * admin.el (set-version): Don't update src/emacs.c. + * quick-install-emacs (VERSION): Get it from configure.in, not from + src/emacs.c. + +2011-01-30 Paul Eggert + + strftime: import from gnulib + * notes/copyright: strftime.c moved from src to lib. + +2011-01-25 Glenn Morris + + * bzrmerge.el (bzrmerge-skip-regexp): New variable. + (bzrmerge-missing): Use it. + +2011-01-19 Paul Eggert + + * make-tarball.txt: Suggest 'autoreconf -I m4 --force' + rather than doing rm and autoconf by hand. See + . + +2011-01-17 Paul Eggert + + * notes/bzr (Installing changes from gnulib): New section. + Need for this suggested by Stefan Monnier. + +2011-01-17 Stefan Monnier + + * bzrmerge.el (bzrmerge-apply): Warn the user when the tree might be in + an inconsistent state. + +2011-01-17 Paul Eggert + + Update copyright notes to match recent gnulib-related changes. + * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in, + arg-nonnull.h, c++defs.h, compile, depcomp, missing, + warn-on-use.h, lib/*.[ch], lib/gnulib.mk. Remove src/mktime.c, + lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and + are subsumed by the lib/*.[ch] rule). Remove m4/getopt.m4 (now + subsumed by m4/*.m4 rule). config.guess, config.sub, and + doc/man/texinfo.tex are now copied in from gnulib. + +2011-01-15 Glenn Morris + + * charsets/cp51932.awk, charsets/eucjp-ms.awk: No longer print arch-tag. + + * bzrmerge.el (bzrmerge-missing): Add another skip indicator. + (bzrmerge-resolve): Also ignore cl-loaddefs.el. + +2011-01-14 Glenn Morris * admin.el (set-copyright): Also handle \year in refcards/*.tex. diff --cc doc/misc/ChangeLog index 67197450a5b,a822338225a..530f7f1c123 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,20 -1,21 +1,33 @@@ -2011-02-23 Glenn Morris ++2011-02-23 Michael Albinus + - * dired-x.texi (Features, Local Variables): Fix typos. - (Features): Minor rephrasing. ++ * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and ++ "Debian GNU/Linux". + -2011-02-19 Glenn Morris ++ * trampver.texi [xemacs]: Set emacsothername to "Emacs". ++ +2011-02-23 Glenn Morris + ++ * dired-x.texi (Features): Minor rephrasing. ++ (Local Variables): Fix typos. + + * edt.texi, erc.texi, gnus.texi, idlwave.texi, mh-e.texi: + Standardize some Emacs/XEmacs terminology. + -2011-02-19 Michael Albinus + * dired-x.texi (Features): Don't advertise obsolete local variables. + Simplify layout. + (Omitting Variables): Update local variables example. + (Local Variables): Say this is obsolete. Fix description of + dired-enable-local-variables possible values. - * tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and - "Debian GNU/Linux". +2011-02-21 Lars Ingebrigtsen - * trampver.texi [xemacs]: Set emacsothername to "Emacs". + * gnus.texi (Article Date): Clarify gnus-article-update-date-headers. -2011-02-18 Eli Zaretskii +2011-02-20 Lars Ingebrigtsen + + * gnus.texi (Window Layout): Document layout names. + +2011-02-19 Eli Zaretskii * ada-mode.texi: Sync @dircategory with ../../info/dir. * auth.texi: Sync @dircategory with ../../info/dir. diff --cc doc/misc/tramp.texi index 346354b3170,f76df61335c..8bcce244f9d --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@@ -443,12 -449,15 +442,12 @@@ Support of gateways exists since April @ifset emacsgvfs GVFS integration started in February 2009. @end ifset -@ifset emacsimap -Storing files into IMAP mailboxes has been added in September 2009. -@end ifset In December 2001, @value{tramp} has been added to the XEmacs package - repository. Being part of the GNU Emacs repository happened in June - 2002, the first release including @value{tramp} was GNU Emacs 22.1. + repository. Being part of the Emacs repository happened in June 2002, + the first release including @value{tramp} was Emacs 22.1. - @value{tramp} is also a GNU/Linux Debian package since February 2001. + @value{tramp} is also a Debian GNU/Linux package since February 2001. @c Installation chapter is necessary only in case of standalone @@@ -2740,13 -2757,13 +2740,13 @@@ There is also a Savannah project page @item Which systems does it work on? - The package has been used successfully on GNU Emacs 22, GNU Emacs 23, - XEmacs 21 (starting with 21.4), and SXEmacs 22. + The package has been used successfully on Emacs 22, Emacs 23, XEmacs + 21 (starting with 21.4), and SXEmacs 22. The package was intended to work on Unix, and it really expects a -Unix-like system on the remote end (except the @option{smb} and -@option{imap} methods), but some people seemed to have some success -getting it to work on MS Windows XP/Vista/7 @value{emacsname}. +Unix-like system on the remote end (except the @option{smb} method), +but some people seemed to have some success getting it to work on MS +Windows XP/Vista/7 @value{emacsname}. @item diff --cc doc/misc/trampver.texi index ff5641fb4b4,1cfcba637ae..437b1372c11 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@@ -63,7 -70,12 +63,7 @@@ @set postfixhop / @set ipv6prefix @set ipv6postfix - @set emacsothername GNU Emacs + @set emacsothername Emacs @set emacsotherdir emacs @set emacsotherfilename tramp-emacs.html -@set japanesemanual tramp_ja-xemacs.html @end ifset - -@ignore - arch-tag: e0fe322c-e06b-46eb-bb5b-d091b521f41c -@end ignore diff --cc lisp/ChangeLog index 14ef035445a,75010513c12..df3098332f9 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,111 -1,13 +1,119 @@@ + 2011-02-23 Kenichi Handa + + * mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an + error when a multipart boundary in the nested multipart is found. + -2011-02-22 Kenichi Handa - + * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of + header components. + +2011-02-23 Glenn Morris + + * dired.el (dired-mode): Call hack-dir-local-variables-non-file-buffer. + * dired-x.el (dired-omit-mode): Safe if boolean. + (dired-enable-local-variables): Fix doc and custom type. + (dired-enable-local-variables, dired-local-variables-file) + (dired-hack-local-variables): Make obsolete. + (dired-omit-here-always): Use dir-locals.el instead. + + * files.el (safe-local-eval-forms): Add the write-file-hooks version. + +2011-02-22 Stefan Monnier + + * help-fns.el (describe-function-1): Don't signal an error just because + the DOC file disappeared. + +2011-02-22 Seppo Sade (tiny change) + + * eshell/esh-ext.el (eshell-external-command): Do not restrict + remote check to "ftp". (Bug#8089) + +2011-02-21 Alan Mackenzie + + Fix bug #7930. + * progmodes/cc-engine.el (c-state-literal-at): Prevent positions + in macros finding their way into c-state-nonlit-pos-cache. + Strengthen the comments. + (c-state-dump): New commented out diagnostic routine. + +2011-02-21 Michael Albinus + + * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use + `field' property of `rfn-eshadow-overlay'. + +2011-02-21 Lars Ingebrigtsen + + * net/netrc.el (netrc-parse): Comment fix. + +2011-02-21 Chong Yidong + + * color.el (color-name-to-rgb): Rename from color-rgb->normalize. + Autoload. Add optional arg FRAME, and pass it to color-values. + (color-complement): Caller changed. Doc fix. + (color-gradient): Rewrite for better clarity and efficiency. + + * faces.el (color-values): Use cond for clarity. Doc fix. + + * facemenu.el (color-rgb-to-hsv): Delete; use the version in + color.el instead. + (list-colors-sort-key, list-colors-print): + Use color-normalized-values. + +2011-02-20 Drew Adams + + * color.el: First part of merge from hexrgb.el. + (color-rgb-to-hex): Rename from color-rgb->hex. + (color-rgb-to-hsv): Rename from color-rgb->hsv. Force hue and + saturation to zero if the value is too small. + (color-rgb-to-hsl): Rename from color-rgb->hsl. + (color-srgb-to-xyz): Rename from color-srgb->xyz. Doc fix. + (color-xyz-to-srgb): Rename from color-xyz->srgb. Doc fix. + (color-xyz-to-lab): Rename from color-xyz->lab. Doc fix. + (color-lab-to-xyz): Rename from color-lab->xyz. Doc fix. + (color-lab-to-srgb): Rename from color-lab->srgb. Doc fix. + (color-cie-de2000): Doc fix. + +2011-02-20 Alan Mackenzie + + * progmodes/cc-cmds.el (c-beginning-of-statement): Avoid loop in + locating the beginning of a macro. (Bug#7595) + +2011-02-20 Glenn Morris + + * edmacro.el (edmacro-eight-bits): Make it a defcustom. + Don't autoload it. + + * autorevert.el (auto-revert-mode, auto-revert-tail-mode) + (global-auto-revert-ignore-buffer): Remove leading "*" from docs. + +2011-02-19 Dmitry Bolshakov + Dima Kogan (tiny change) + + * progmodes/hideshow.el (hs-find-block-beginning) + (hs-hide-level-recursive): Ignore comments when parsing braces + (Bug#8036). + +2011-02-19 Chong Yidong + + * vc/vc-bzr.el (vc-bzr-bound-branch-p): New function. + (vc-bzr-pull): Use it. + +2011-02-19 Chong Yidong + + * vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted. + (vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf + but returning an alist. Ignore comments in bzr conffile. + (vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf. + (vc-bzr-error-regex-alist): New var. + (vc-bzr-merge-branch): Use it to highlight the pull/merge buffer. + + * vc/vc-dispatcher.el (vc-do-async-command): + Bind inhibit-read-only to t. + + * progmodes/compile.el (compilation--flush-directory-cache): + Handle the case where cdr of compilation--flush-directory-cache + points to no buffer, which can occur if we previously switched to + compilation-mode in a pregenerated buffer. + 2011-02-19 Kenichi Handa * mail/rmailmm.el (rmail-mime-find-header-encoding): Be sure to diff --cc lisp/mail/rmail.el index 06867f6d92a,5e9baed1c2e..7fe5383d865 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@@ -3441,51 -3447,34 +3441,61 @@@ does not pop any summary buffer. ;; The function used here must behave like insert-buffer wrt ;; point and mark (see doc of sc-cite-original). (setq yank-action (list 'insert-buffer replybuffer))) - (setq others (cons (cons "cc" cc) others)) - (setq others (cons (cons "in-reply-to" in-reply-to) others)) - (setq others + (push (cons "cc" cc) other-headers) + (push (cons "in-reply-to" in-reply-to) other-headers) ++ (setq other-headers + (mapcar #'(lambda (elt) + (cons (car elt) (if (stringp (cdr elt)) + (rfc2047-decode-string (cdr elt))))) - others)) ++ other-headers)) + (if (stringp to) (setq to (rfc2047-decode-string to))) + (if (stringp in-reply-to) + (setq in-reply-to (rfc2047-decode-string in-reply-to))) + (if (stringp cc) (setq cc (rfc2047-decode-string cc))) + (if (stringp subject) (setq subject (rfc2047-decode-string subject))) - (if same-window - (compose-mail to subject others - noerase nil - yank-action sendactions) - (if rmail-mail-new-frame - (prog1 - (compose-mail to subject others - noerase 'switch-to-buffer-other-frame - yank-action sendactions) - ;; This is not a standard frame parameter; - ;; nothing except sendmail.el looks at it. + (prog1 + (compose-mail to subject other-headers noerase + switch-function yank-action sendactions + '(rmail-mail-return)) + (if (eq switch-function 'switch-to-buffer-other-frame) + ;; This is not a standard frame parameter; nothing except + ;; sendmail.el looks at it. - (modify-frame-parameters (selected-frame) + (modify-frame-parameters (selected-frame) - '((mail-dedicated-frame . t)))) - (compose-mail to subject others - noerase 'switch-to-buffer-other-window - yank-action sendactions))))) + '((mail-dedicated-frame . t))))))) + +(defun rmail-mail-return () + (cond + ;; If there is only one visible frame with no special handling, + ;; consider deleting the mail window to return to Rmail. + ((or (null (delq (selected-frame) (visible-frame-list))) + (not (or (window-dedicated-p (frame-selected-window)) + (and pop-up-frames (one-window-p)) + (cdr (assq 'mail-dedicated-frame + (frame-parameters)))))) + (let (rmail-flag summary-buffer) + (and (not (one-window-p)) + (with-current-buffer + (window-buffer (next-window (selected-window) 'not)) + (setq rmail-flag (eq major-mode 'rmail-mode)) + (setq summary-buffer + (and (boundp 'mail-bury-selects-summary) + mail-bury-selects-summary + (boundp 'rmail-summary-buffer) + rmail-summary-buffer + (buffer-name rmail-summary-buffer) + (not (get-buffer-window rmail-summary-buffer)) + rmail-summary-buffer)))) + (if rmail-flag + ;; If the Rmail buffer has a summary, show that. + (if summary-buffer (switch-to-buffer summary-buffer) + (delete-window))))) + ;; If the frame was probably made for this buffer, the user + ;; probably wants to delete it now. + ((display-multi-frame-p) + (delete-frame (selected-frame))) + ;; The previous frame is where normally they have the Rmail buffer + ;; displayed. + (t (other-frame -1)))) (defun rmail-mail () "Send mail in another window. diff --cc src/ChangeLog index 8befb78f91f,addaab34572..194f1c44f84 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,95 -1,26 +1,100 @@@ -2011-02-22 Kenichi Handa ++2011-02-23 Kenichi Handa + + * font.c (font_open_entity): Be sure to set scaled_pixel_size. - (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is - integer. ++ (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is integer. + -2011-02-19 Chong Yidong +2011-02-22 Paul Eggert - * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS. + * dired.c (Ffile_attributes): Simplify and avoid #ifdef. -2011-02-17 Kenichi Handa +2011-02-22 Wolfgang Jenkner (tiny change) - * font.c (font_open_entity): Be sure to set scaled_pixel_size. - (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is - integer. + * lread.c (openp): Correct Boolean typo in last commit. -2011-02-13 Eli Zaretskii +2011-02-22 Adrian Robert - * xdisp.c (redisplay_internal): Resynchronize `w' if the selected - window is changed inside calls to do_pending_window_change. - (Bug#8020) + * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified + key to Emacs, treat as unmodified (go to input manager processing). -2011-02-12 Eli Zaretskii +2011-02-22 Paul Eggert + + Assume S_ISLNK etc. work, since gnulib supports this. + * config.in: Regenerate. + * dired.c (lstat): Remove. + (file_name_completion): Assume S_ISDIR works. + (file_name_completion_stat): Assume S_ISLNK works. + Do not bother calling stat unless lstat says it's a symlink. + * fileio.c (S_ISLNK, S_ISFIFO, S_ISREG, lstat): Remove. + (Fcopy_file): Assume S_ISREG and S_ISLNK work. + (check_writable, Ffile_writable_p, Fset_file_times): + Assume S_ISDIR works. + (Ffile_readable_p): Use S_IFIFO, not S_ISFIFO, to guess whether + fifos exist. + (Ffile_regular_p, Finsert_file_contents): Assume S_ISREG works. + * filelock.c (S_ISLNK): Remove. + * lread.c (openp): Assume S_ISDIR works. + * xrdb.c (S_ISDIR): Remove. + +2011-02-21 Eli Zaretskii + + * makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to + lib/makefile.w32-in. + ($(BLD)/dired.$(O)): Depend on $(EMACS_ROOT)/lib/filemode.h. + (GLOBAL_SOURCES): Remove filemode.c. + (OBJ1): Remove $(BLD)/filemode.$(O). + +2011-02-21 Paul Eggert + + Import filemode module from gnulib. + * Makefile.in (base_obj): Remove filemode.o, as it's now in ../lib. + * deps.mk (dired.o): Depend on ../lib/filemode.h, too. + (filemode.o): Remove; this is now in ../lib. + * dired.c: Include . + (filemodestring): Remove now-redundant decl. + * config.in: Regenerate. + +2011-02-20 Eli Zaretskii + + * makefile.w32-in ($(BLD)/fns.$(O)): Depend on + $(EMACS_ROOT)/lib/md5.h and on stamp_BLD. + +2011-02-20 Christoph Scholtes + + * makefile.w32-in: Remove md5.$(O). + ($(BLD)/md5.$(O)): Remove prerequisites, moved to + lib/makefile.w32-in. + +2011-02-20 Paul Eggert + + Import crypto/md5 and stdint modules from gnulib. + * Makefile.in (base_obj): Remove md5.o, since this file + is in lib now. + * config.in: Regenerate. + * md5.h, md5.h: Move to ../lib. + * deps.mk (md5.o): Remove. + (fns.o): Depend on ../lib/md5.h, not md5.h. + +2011-02-19 Eli Zaretskii + + * termcap.c (tputs): Don't declare baud_rate. + + * s/msdos.h (strtold): Define to _strtold. + +2011-02-18 Stefan Monnier + + * process.c (Fstart_process, Fmake_serial_process) + (Fmake_network_process, server_accept_connection): + Use empty_unibyte_string. + + * alloc.c (make_unibyte_string): Don't SET_UNIBYTE redundantly. + + * lread.c (Qdir_ok): New constant. + (syms_of_lread): Initialize it. + (openp): Don't ignore directories if the predicate returns dir-ok. + +2011-02-18 Eli Zaretskii + + * xdisp.c (display_line): Fix the change made for bug#7939. * terminal.c (create_terminal): Use default-keyboard-coding-system and default-terminal-coding-system to initialize coding systems of