6 files changed, 34 insertions, 5 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 27f0a28c9f4..9db03a83b7c 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-18  Glenn Morris  <rgm@gnu.org>
+
+        * PROBLEMS: Add note about svn+ssh.  (Bug#7791)
+
 2011-01-14  Glenn Morris  <rgm@gnu.org>
 
         * refcards/calccard.tex, refcards/cs-dired-ref.tex:
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 3766250b782..7e856c11315 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1660,6 +1660,19 @@ the script:
 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.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 969b0c6997a..2d381534228 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2011-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the
+        keymap expression.  Improve docstring.
+
+2011-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * electric.el (electric-indent-post-self-insert-function):
         Don't auto-indent for indent-to-left-margin, it's too often
         counter-productive.
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 3d18d8e1cca..7f7198c36c9 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -94,8 +94,9 @@ Optional INIT-VALUE is the initial value of the mode's variable.
 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 @@ With zero or negative ARG turn mode off.
              (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))
diff --git a/src/ChangeLog b/src/ChangeLog
index 9267a96467c..f91ec458464 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * image.c (syms_of_image): Don't access XSYMBOL's internals directly.
+
 2011-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
         Give a name FLOAT_TO_STRING_BUFSIZE to the constant 350.
diff --git a/src/image.c b/src/image.c
index b5b1843ed94..260e33c3cfb 100644
--- a/src/image.c
+++ b/src/image.c
@@ -8801,11 +8801,13 @@ non-numeric, there is no explicit limit on the size of images.  */);
 #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)