procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-23 branch, up to 2010-05-20T22:16:19Z!juri@jurta.org.

Browse source
This commit is contained in:
Glenn Morris 2011-01-17 18:49:59 -08:00
commit a9faac5c63
6 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/ChangeLog
View file

@ -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:

13
etc/PROBLEMS
View file

@ -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.

5
lisp/ChangeLog
View file

@ -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):

7
lisp/emacs-lisp/easy-mmode.el
View file

@ -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))

4
src/ChangeLog
View file

@ -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.

6
src/image.c
View file

@ -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)