Mercurial > emacs
changeset 112347:67bea318ed68
Merge from emacs-23 branch, up to r100386.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Mon, 17 Jan 2011 18:49:59 -0800 |
| parents | c22f11c3d8ba (current diff) a3e090c3eecb (diff) |
| children | 49c0a3b6d624 |
| files | etc/ChangeLog etc/PROBLEMS lisp/ChangeLog lisp/emacs-lisp/easy-mmode.el src/ChangeLog src/image.c |
| diffstat | 6 files changed, 34 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/ChangeLog Mon Jan 17 18:35:23 2011 -0800 +++ b/etc/ChangeLog Mon Jan 17 18:49:59 2011 -0800 @@ -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:
--- a/etc/PROBLEMS Mon Jan 17 18:35:23 2011 -0800 +++ b/etc/PROBLEMS Mon Jan 17 18:49:59 2011 -0800 @@ -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.
--- a/lisp/ChangeLog Mon Jan 17 18:35:23 2011 -0800 +++ b/lisp/ChangeLog Mon Jan 17 18:49:59 2011 -0800 @@ -1,3 +1,8 @@ +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):
--- a/lisp/emacs-lisp/easy-mmode.el Mon Jan 17 18:35:23 2011 -0800 +++ b/lisp/emacs-lisp/easy-mmode.el Mon Jan 17 18:49:59 2011 -0800 @@ -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))
--- a/src/ChangeLog Mon Jan 17 18:35:23 2011 -0800 +++ b/src/ChangeLog Mon Jan 17 18:49:59 2011 -0800 @@ -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.
--- a/src/image.c Mon Jan 17 18:35:23 2011 -0800 +++ b/src/image.c Mon Jan 17 18:49:59 2011 -0800 @@ -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)