From e7f50e8ff0f760dede1dea496f7f69486c657bcd Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 16 Jan 2011 04:51:59 -0500 Subject: [PATCH 1/4] Fix bug #7848 with using SET_SYMBOL_VALUE in image.c !!!DO NOT MERGE TO THE TRUNK!!! image.c (syms_of_image): Don't use SET_SYMBOL_VALUE. --- src/ChangeLog | 4 ++++ src/image.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3a65048f057..aa9512abcb2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-01-16 Eli Zaretskii + + * image.c (syms_of_image): Don't use SET_SYMBOL_VALUE. (Bug#7848) + 2011-01-15 Martin Rudalics * window.c (inhibit_point_swap): New variable. diff --git a/src/image.c b/src/image.c index 8dcd2da67d4..31314b0a617 100644 --- a/src/image.c +++ b/src/image.c @@ -8464,9 +8464,9 @@ non-numeric, there is no explicit limit on the size of images. */); Qlibpng_version = intern_c_string ("libpng-version"); staticpro (&Qlibpng_version); #if HAVE_PNG - SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (PNG_LIBPNG_VER)); + XSYMBOL (Qlibpng_version)->value = make_number (PNG_LIBPNG_VER); #else - SET_SYMBOL_VAL (XSYMBOL (Qlibpng_version), make_number (-1)); + XSYMBOL (Qlibpng_version)->value = make_number (-1)); #endif #endif From 0514b4be5148fe07965ce5cec08598da8c8699e3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 16 Jan 2011 10:40:47 -0500 Subject: [PATCH 2/4] * image.c (syms_of_image): Don't access XSYMBOL's internals directly. --- src/ChangeLog | 4 ++++ src/image.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index aa9512abcb2..26aab0d5b5f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2011-01-16 Stefan Monnier + + * image.c (syms_of_image): Don't access XSYMBOL's internals directly. + 2011-01-16 Eli Zaretskii * image.c (syms_of_image): Don't use SET_SYMBOL_VALUE. (Bug#7848) diff --git a/src/image.c b/src/image.c index 31314b0a617..631c73a6008 100644 --- a/src/image.c +++ b/src/image.c @@ -8463,11 +8463,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 - XSYMBOL (Qlibpng_version)->value = make_number (PNG_LIBPNG_VER); + make_number (PNG_LIBPNG_VER) #else - XSYMBOL (Qlibpng_version)->value = make_number (-1)); + make_number (-1) #endif + ); #endif #if defined (HAVE_XPM) || defined (HAVE_NS) From 1a1fcbe13fbf6d5bef27016e016c5f03dd3965d6 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 17 Jan 2011 16:42:23 -0500 Subject: [PATCH 3/4] * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the keymap expression. Improve docstring. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/easy-mmode.el | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0ff810a1230..0cb79fe8c29 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2011-01-17 Stefan Monnier + + * emacs-lisp/easy-mmode.el (define-minor-mode): Don't re-evaluate the + keymap expression. Improve docstring. + 2011-01-15 Mark Diekhans * files.el (backup-buffer): Make last-resort backup file in diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index f22cc2c362d..3876e291d1b 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -93,8 +93,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. @@ -256,7 +257,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))) (add-minor-mode ',mode ',lighter From 9d760d754bde2eadd3f017fec5ea1cbe3810d666 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 17 Jan 2011 18:31:59 -0800 Subject: [PATCH 4/4] * etc/PROBLEMS: Add note about svn+ssh. (Bug#7791) --- etc/ChangeLog | 4 ++++ etc/PROBLEMS | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/etc/ChangeLog b/etc/ChangeLog index 112f4ff60d0..dc80bcb3964 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2011-01-18 Glenn Morris + + * PROBLEMS: Add note about svn+ssh. (Bug#7791) + 2011-01-03 Glenn Morris * refcards/calccard.tex, refcards/cs-dired-ref.tex: diff --git a/etc/PROBLEMS b/etc/PROBLEMS index d269c82e3c4..b419e409e2b 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1745,6 +1745,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. @@ -3812,5 +3825,3 @@ Local variables: mode: outline paragraph-separate: "[ ]*$" end: - -arch-tag: 49fc0d95-88cb-4715-b21c-f27fb5a4764a