[Emacs-diffs] /srv/bzr/emacs/trunk r102884: Merge from emacs-23 branch, up to r100386.

[Glenn Morris]

------------------------------------------------------------
revno: 102884 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2011-01-17 18:49:59 -0800
message:
  Merge from emacs-23 branch, up to r100386.
modified:
  etc/ChangeLog
  etc/PROBLEMS
  lisp/ChangeLog
  lisp/emacs-lisp/easy-mmode.el
  src/ChangeLog
  src/image.c

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2011-01-14 17:42:40 +0000
+++ b/etc/ChangeLog     2011-01-18 02:49:59 +0000
@@ -1,3 +1,7 @@
+2011-01-18  Glenn Morris  <address@hidden>
+
+       * PROBLEMS: Add note about svn+ssh.  (Bug#7791)
+
 2011-01-14  Glenn Morris  <address@hidden>
 
        * refcards/calccard.tex, refcards/cs-dired-ref.tex:

=== modified file 'etc/PROBLEMS'
--- a/etc/PROBLEMS      2011-01-14 17:18:41 +0000
+++ b/etc/PROBLEMS      2011-01-18 02:49:59 +0000
@@ -1660,6 +1660,19 @@
 exec 2> >(exec cat >&2 2>/dev/null)
 exec ssh "$@"
 
+*** GNU/Linux: Truncated svn annotate output with SSH.
+http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7791
+
+The symptoms are: you are accessing a svn repository over SSH.
+You use vc-annotate on a large (several thousand line) file, and the
+result is truncated around the 1000 line mark.  It works fine with
+other access methods (eg http), or from outside Emacs.
+
+This may be a similar libc/SSH issue to the one mentioned above for CVS.
+A similar workaround seems to be effective: create a script with the
+same contents as the one used above for CVS_RSH, and set the SVN_SSH
+environment variable to point to it.
+
 *** GNU/Linux: On Linux-based GNU systems using libc versions 5.4.19 through
 5.4.22, Emacs crashes at startup with a segmentation fault.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-18 02:11:51 +0000
+++ b/lisp/ChangeLog    2011-01-18 02:49:59 +0000
@@ -1,5 +1,10 @@
 2011-01-18  Stefan Monnier  <address@hidden>
 
+       * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the
+       keymap expression.  Improve docstring.
+
+2011-01-18  Stefan Monnier  <address@hidden>
+
        * electric.el (electric-indent-post-self-insert-function):
        Don't auto-indent for indent-to-left-margin, it's too often
        counter-productive.

=== modified file 'lisp/emacs-lisp/easy-mmode.el'
--- a/lisp/emacs-lisp/easy-mmode.el     2011-01-14 17:18:41 +0000
+++ b/lisp/emacs-lisp/easy-mmode.el     2011-01-18 02:49:59 +0000
@@ -94,8 +94,9 @@
 Optional LIGHTER is displayed in the modeline when the mode is on.
 Optional KEYMAP is the default keymap bound to the mode keymap.
   If non-nil, it should be a variable name (whose value is a keymap),
-  a keymap, or a list of arguments for `easy-mmode-define-keymap'.
-  If KEYMAP is a keymap or list, this also defines the variable MODE-map.
+  or an expression that returns either a keymap or a list of
+  arguments for `easy-mmode-define-keymap'.  If KEYMAP is not a symbol,
+  this also defines the variable MODE-map.
 
 BODY contains code to execute each time the mode is enabled or disabled.
   It is executed after toggling the mode, and before running MODE-hook.
@@ -274,7 +275,7 @@
             (let ((m ,keymap))
               (cond ((keymapp m) m)
                     ((listp m) (easy-mmode-define-keymap m))
-                    (t (error "Invalid keymap %S" ,keymap))))
+                    (t (error "Invalid keymap %S" m))))
             ,(format "Keymap for `%s'." mode-name)))
 
        ,(if (not (symbolp mode))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-17 19:24:36 +0000
+++ b/src/ChangeLog     2011-01-18 02:49:59 +0000
@@ -1,3 +1,7 @@
+2011-01-18  Stefan Monnier  <address@hidden>
+
+       * image.c (syms_of_image): Don't access XSYMBOL's internals directly.
+
 2011-01-17  Paul Eggert  <address@hidden>
 
        Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.

=== modified file 'src/image.c'
--- a/src/image.c       2011-01-17 19:01:01 +0000
+++ b/src/image.c       2011-01-18 02:49:59 +0000
@@ -8801,11 +8801,13 @@
 #ifdef HAVE_NTGUI
   Qlibpng_version = intern_c_string ("libpng-version");
   staticpro (&Qlibpng_version);
+  Fset (Qlibpng_version,
 #if HAVE_PNG
-  SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (PNG_LIBPNG_VER));
+       make_number (PNG_LIBPNG_VER)
 #else
-  SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (-1));
+       make_number (-1)
 #endif
+       );
 #endif
 
 #if defined (HAVE_XPM) || defined (HAVE_NS)