Mercurial > emacs

changeset 106932:91a0123d1993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Wed, 13 Jan 2010 22:04:10 +0000
parents fc97b35886c9 (current diff) 1f555410c9c7 (diff)
children 2afe12cb88f4
files
diffstat 15 files changed, 38 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/doc/emacs/ChangeLog	Wed Jan 13 09:37:38 2010 +0000
+++ b/doc/emacs/ChangeLog	Wed Jan 13 22:04:10 2010 +0000
@@ -6735,8 +6735,8 @@
 
 1998-04-06  Andreas Schwab  <schwab@gnu.org>
 
-	* Makefile.in (ENVADD): Enviroment vars to pass to texi2dvi.  Use
-	it in dvi targets.
+	* Makefile.in (ENVADD): Environment vars to pass to texi2dvi.
+	Use it in dvi targets.
 
 1997-09-23  Paul Eggert  <eggert@twinsun.com>
 
--- a/doc/misc/ChangeLog	Wed Jan 13 09:37:38 2010 +0000
+++ b/doc/misc/ChangeLog	Wed Jan 13 22:04:10 2010 +0000
@@ -6180,8 +6180,8 @@
 
 1998-04-06  Andreas Schwab  <schwab@gnu.org>
 
-	* Makefile.in (ENVADD): Enviroment vars to pass to texi2dvi.  Use
-	it in dvi targets.
+	* Makefile.in (ENVADD): Environment vars to pass to texi2dvi.
+	Use it in dvi targets.
 	(../etc/GNU): Change to $(srcdir) first.
 
 1998-03-11  Carsten Dominik  <cd@delysid.gnu.org>
--- a/lib-src/emacsclient.c	Wed Jan 13 09:37:38 2010 +0000
+++ b/lib-src/emacsclient.c	Wed Jan 13 22:04:10 2010 +0000
@@ -340,7 +340,7 @@
 /*
   getenv wrapper for Windows
 
-  This is needed to duplicate Emacs's behavior, which is to look for enviroment
+  This is needed to duplicate Emacs's behavior, which is to look for environment
   variables in the registry if they don't appear in the environment.
 */
 char *
--- a/lisp/dired.el	Wed Jan 13 09:37:38 2010 +0000
+++ b/lisp/dired.el	Wed Jan 13 22:04:10 2010 +0000
@@ -3517,7 +3517,7 @@
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "c7d3d0354ca849c90d3aaf33fa06341d")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "557aca1f6e86b39f1c7612ee123d5354")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
@@ -3970,7 +3970,7 @@
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;;  "c1bb83404017aa89655222b2b50471ed")
+;;;;;;  "bb37ec379c0a523368794491b691fd8d")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
--- a/lisp/emacs-lisp/cl-loaddefs.el	Wed Jan 13 09:37:38 2010 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el	Wed Jan 13 22:04:10 2010 +0000
@@ -10,7 +10,7 @@
 ;;;;;;  ceiling* floor* isqrt lcm gcd cl-progv-before cl-set-frame-visible-p
 ;;;;;;  cl-map-overlays cl-map-intervals cl-map-keymap-recursively
 ;;;;;;  notevery notany every some mapcon mapcan mapl maplist map
-;;;;;;  cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "d2000926c438cbd72f37587241cab7ed")
+;;;;;;  cl-mapcar-many equalp coerce) "cl-extra" "cl-extra.el" "d93072a26c59f663a92b10df8bc28187")
 ;;; Generated autoloads from cl-extra.el
 
 (autoload 'coerce "cl-extra" "\
@@ -282,7 +282,7 @@
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "efa4be368ff0f44b3144392f14cddfc6")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "3867c0613dfd69780f561012a1dfe67b")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
@@ -741,7 +741,7 @@
 ;;;;;;  find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not
 ;;;;;;  substitute-if substitute delete-duplicates remove-duplicates
 ;;;;;;  delete-if-not delete-if delete* remove-if-not remove-if remove*
-;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" "b6529074e320e8a9f65b2461474d0c6a")
+;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" "ec3ea1c77742734db8496272fe5721be")
 ;;; Generated autoloads from cl-seq.el
 
 (autoload 'reduce "cl-seq" "\
--- a/lisp/emulation/tpu-edt.el	Wed Jan 13 09:37:38 2010 +0000
+++ b/lisp/emulation/tpu-edt.el	Wed Jan 13 22:04:10 2010 +0000
@@ -2438,7 +2438,7 @@
 
 
 ;;;### (autoloads (tpu-set-cursor-bound tpu-set-cursor-free tpu-set-scroll-margins
-;;;;;;  tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "599e52b6cce2b9a2c2efa3e7d3e7a475")
+;;;;;;  tpu-cursor-free-mode) "tpu-extras" "tpu-extras.el" "d003e4c2f1291eccc629926bb0f88e17")
 ;;; Generated autoloads from tpu-extras.el
 
 (autoload 'tpu-cursor-free-mode "tpu-extras" "\
--- a/lisp/ibuffer.el	Wed Jan 13 09:37:38 2010 +0000
+++ b/lisp/ibuffer.el	Wed Jan 13 22:04:10 2010 +0000
@@ -2641,7 +2641,7 @@
 ;;;;;;  ibuffer-backward-filter-group ibuffer-forward-filter-group
 ;;;;;;  ibuffer-toggle-filter-group ibuffer-mouse-toggle-filter-group
 ;;;;;;  ibuffer-interactive-filter-by-mode ibuffer-mouse-filter-by-mode
-;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "811ee3bd414f35c6a1966e64e9e597f1")
+;;;;;;  ibuffer-auto-mode) "ibuf-ext" "ibuf-ext.el" "4fb4f1a32cf4ecf4669a133a866f4a14")
 ;;; Generated autoloads from ibuf-ext.el
 
 (autoload 'ibuffer-auto-mode "ibuf-ext" "\
--- a/lisp/mail/rmail.el	Wed Jan 13 09:37:38 2010 +0000
+++ b/lisp/mail/rmail.el	Wed Jan 13 22:04:10 2010 +0000
@@ -4214,7 +4214,7 @@
 ;;; Start of automatically extracted autoloads.
 
 ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el"
-;;;;;;  "31f0128d57ee5aefe13ec6060a5c63cc")
+;;;;;;  "60db8013bf16d7999914a16cda435287")
 ;;; Generated autoloads from rmailedit.el
 
 (autoload 'rmail-edit-current-message "rmailedit" "\
@@ -4226,7 +4226,7 @@
 
 ;;;### (autoloads (rmail-next-labeled-message rmail-previous-labeled-message
 ;;;;;;  rmail-read-label rmail-kill-label rmail-add-label) "rmailkwd"
-;;;;;;  "rmailkwd.el" "2e986921026eea971b49e91f53967f77")
+;;;;;;  "rmailkwd.el" "7027ce1ac922c0dd51262b641e4d42c1")
 ;;; Generated autoloads from rmailkwd.el
 
 (autoload 'rmail-add-label "rmailkwd" "\
@@ -4269,7 +4269,7 @@
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "04becfcbd937ebfb3020515f84e79d0a")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "d196de6dfb74fe87a3d02189096b795f")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
@@ -4285,7 +4285,7 @@
 ;;;***
 
 ;;;### (autoloads (set-rmail-inbox-list) "rmailmsc" "rmailmsc.el"
-;;;;;;  "de01c37c81339201034a01732b97f44e")
+;;;;;;  "b2a72d4e370f2d2b31b6f8f0794820e4")
 ;;; Generated autoloads from rmailmsc.el
 
 (autoload 'set-rmail-inbox-list "rmailmsc" "\
@@ -4301,7 +4301,7 @@
 
 ;;;### (autoloads (rmail-sort-by-labels rmail-sort-by-lines rmail-sort-by-correspondent
 ;;;;;;  rmail-sort-by-recipient rmail-sort-by-author rmail-sort-by-subject
-;;;;;;  rmail-sort-by-date) "rmailsort" "rmailsort.el" "3f2b10b0272ea56cb604f29330d95fc4")
+;;;;;;  rmail-sort-by-date) "rmailsort" "rmailsort.el" "5a3b5ee477d2fbf79d0c566d776a7fd4")
 ;;; Generated autoloads from rmailsort.el
 
 (autoload 'rmail-sort-by-date "rmailsort" "\
@@ -4360,7 +4360,7 @@
 
 ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
 ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
-;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "d7d82233836cae1295ffa85f7371f857")
+;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "26b95919c7e1f8c5609ce7323aee77ae")
 ;;; Generated autoloads from rmailsum.el
 
 (autoload 'rmail-summary "rmailsum" "\
@@ -4408,7 +4408,7 @@
 ;;;***
 
 ;;;### (autoloads (unforward-rmail-message undigestify-rmail-message)
-;;;;;;  "undigest" "undigest.el" "b691540ddff5c394e9ebc3517051445f")
+;;;;;;  "undigest" "undigest.el" "8cf8a8ffa48eeddf0bde388fa8de1783")
 ;;; Generated autoloads from undigest.el
 
 (autoload 'undigestify-rmail-message "undigest" "\
--- a/lisp/ps-print.el	Wed Jan 13 09:37:38 2010 +0000
+++ b/lisp/ps-print.el	Wed Jan 13 22:04:10 2010 +0000
@@ -6656,7 +6656,7 @@
 ;; But autoload them here to make the separation invisible.
 
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "fba1322a48e0d8f2109629ea0c4dd734")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "9187df3473401876e0df4937c311fbaf")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
--- a/lisp/vc-bzr.el	Wed Jan 13 09:37:38 2010 +0000
+++ b/lisp/vc-bzr.el	Wed Jan 13 22:04:10 2010 +0000
@@ -363,8 +363,9 @@
 		       (let ((l-c-parent-dir (match-string 1)))
 			 (when (and (memq system-type '(ms-dos windows-nt))
 				    (string-match-p "^/[[:alpha:]]:" l-c-parent-dir))
-			   ;;; On Windows, file:// URLs often have three slashes,
-			   ;;; so we must remove the remaining one (bug#5345)
+			   ;;; The non-Windows code takes a shortcut by using the host/path
+			   ;;; separator slash as the start of the absolute path.  That
+			   ;;; does not work on Windows, so we must remove it (bug#5345)
 			   (setq l-c-parent-dir (substring l-c-parent-dir 1)))
 			 (setq branch-format-file
 			       (expand-file-name vc-bzr-admin-branch-format-file
--- a/nt/ChangeLog	Wed Jan 13 09:37:38 2010 +0000
+++ b/nt/ChangeLog	Wed Jan 13 22:04:10 2010 +0000
@@ -1,3 +1,7 @@
+2010-01-13  Martin Rudalics  <rudalics@gmx.at>
+
+	* emacsclient.rc: Fix format of "LegalCopyright" value.
+
 2009-12-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* INSTALL: Remove obsolete notes about line endings, and fix some typos.
--- a/nt/emacsclient.rc	Wed Jan 13 09:37:38 2010 +0000
+++ b/nt/emacsclient.rc	Wed Jan 13 22:04:10 2010 +0000
@@ -25,8 +25,7 @@
 	    VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0"
 	    VALUE "FileVersion", "23, 1, 91, 0\0"
 	    VALUE "InternalName", "EmacsClient\0"
-	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003,
- 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010\0"
 	    VALUE "OriginalFilename", "emacsclientw.exe"
 	    VALUE "ProductName", "EmacsClient\0"
 	    VALUE "ProductVersion", "23, 1, 91, 0\0"
--- a/src/ChangeLog	Wed Jan 13 09:37:38 2010 +0000
+++ b/src/ChangeLog	Wed Jan 13 22:04:10 2010 +0000
@@ -1,3 +1,8 @@
+2010-01-13  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xterm.c (x_term_init): Avoid garbage-collecting the new terminal
+	during call to vendor-specific-keysyms (Bug#5365).
+
 2010-01-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
 	* keyboard.c (input_available_signal) [SYNC_INPUT]:
--- a/src/emacs.c	Wed Jan 13 09:37:38 2010 +0000
+++ b/src/emacs.c	Wed Jan 13 22:04:10 2010 +0000
@@ -157,7 +157,7 @@
 extern void *malloc_get_state ();
 /* From glibc, a routine that overwrites the malloc internal state.  */
 extern int malloc_set_state ();
-/* Non-zero if the MALLOC_CHECK_ enviroment variable was set while
+/* Non-zero if the MALLOC_CHECK_ environment variable was set while
    dumping.  Used to work around a bug in glibc's malloc.  */
 int malloc_using_checking;
 #endif
--- a/src/xterm.c	Wed Jan 13 09:37:38 2010 +0000
+++ b/src/xterm.c	Wed Jan 13 22:04:10 2010 +0000
@@ -10218,13 +10218,16 @@
 	if (!EQ (XSYMBOL (Qvendor_specific_keysyms)->function, Qunbound))
 	  {
 	    char *vendor = ServerVendor (dpy);
-	    /* Temporarily hide the partially initialized terminal */
+	    /* Temporarily hide the partially initialized terminal,
+	       but make sure it doesn't get garbage collected.  */
+	    int count = inhibit_garbage_collection ();
 	    terminal_list = terminal->next_terminal;
 	    UNBLOCK_INPUT;
 	    terminal->kboard->Vsystem_key_alist
 	      = call1 (Qvendor_specific_keysyms,
 		       vendor ? build_string (vendor) : empty_unibyte_string);
 	    BLOCK_INPUT;
+	    unbind_to (count, Qnil);
 	    terminal->next_terminal = terminal_list;
  	    terminal_list = terminal;
 	  }