Mercurial > emacs
changeset 109587:4a3ef4f17f07
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 26 Jul 2010 22:54:37 +0000 |
| parents | 1f97e508ee42 (current diff) 9eac3b0c2884 (diff) |
| children | a9df84c12868 |
| files | |
| diffstat | 10 files changed, 49 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Jul 26 01:23:49 2010 +0000 +++ b/lisp/ChangeLog Mon Jul 26 22:54:37 2010 +0000 @@ -1,3 +1,14 @@ +2010-07-26 Sam Steingold <sds@gnu.org> + + * mouse.el (mouse-yank-primary, mouse-yank-secondary): + Do not call `x-get-selection' the second time, reuse the value. + +2010-07-26 Daiki Ueno <ueno@unixuser.org> + + * epa-mail.el (epa-mail-mode-map): Add alternative key bindings + which consist of control chars only. Suggested by Richard + Stallman. + 2010-07-25 Daiki Ueno <ueno@unixuser.org> * epa-file.el (epa-file-insert-file-contents): Check if LOCAL-FILE
--- a/lisp/epa-mail.el Mon Jul 26 01:23:49 2010 +0000 +++ b/lisp/epa-mail.el Mon Jul 26 22:54:37 2010 +0000 @@ -32,6 +32,12 @@ (define-key keymap "\C-c\C-ee" 'epa-mail-encrypt) (define-key keymap "\C-c\C-ei" 'epa-mail-import-keys) (define-key keymap "\C-c\C-eo" 'epa-insert-keys) + (define-key keymap "\C-c\C-e\C-d" 'epa-mail-decrypt) + (define-key keymap "\C-c\C-e\C-v" 'epa-mail-verify) + (define-key keymap "\C-c\C-e\C-s" 'epa-mail-sign) + (define-key keymap "\C-c\C-e\C-e" 'epa-mail-encrypt) + (define-key keymap "\C-c\C-e\C-i" 'epa-mail-import-keys) + (define-key keymap "\C-c\C-e\C-o" 'epa-insert-keys) keymap)) (defvar epa-mail-mode-hook nil)
--- a/lisp/mouse.el Mon Jul 26 01:23:49 2010 +0000 +++ b/lisp/mouse.el Mon Jul 26 22:54:37 2010 +0000 @@ -1282,7 +1282,7 @@ (or mouse-yank-at-point (mouse-set-point click)) (let ((primary (x-get-selection 'PRIMARY))) (if primary - (insert (x-get-selection 'PRIMARY)) + (insert primary) (error "No primary selection")))) (defun mouse-kill-ring-save (click) @@ -1577,7 +1577,7 @@ (or mouse-yank-at-point (mouse-set-point click)) (let ((secondary (x-get-selection 'SECONDARY))) (if secondary - (insert (x-get-selection 'SECONDARY)) + (insert secondary) (error "No secondary selection")))) (defun mouse-kill-secondary ()
--- a/lwlib/ChangeLog Mon Jul 26 01:23:49 2010 +0000 +++ b/lwlib/ChangeLog Mon Jul 26 22:54:37 2010 +0000 @@ -1,3 +1,7 @@ +2010-07-26 Dan Nicolaescu <dann@ics.uci.edu> + + * xlwmenu.h (xlwmenu_window_p, xlwmenu_redisplay): Add declarations. + 2010-07-12 Andreas Schwab <schwab@linux-m68k.org> * Makefile.in (C_WARNINGS_SWITCH, PROFILING_CFLAGS): Set from
--- a/lwlib/xlwmenu.h Mon Jul 26 01:23:49 2010 +0000 +++ b/lwlib/xlwmenu.h Mon Jul 26 22:54:37 2010 +0000 @@ -81,6 +81,9 @@ extern WidgetClass xlwMenuWidgetClass; +extern int xlwmenu_window_p (Widget w, Window window); +extern void xlwmenu_redisplay (Widget); + #endif /* _XlwMenu_h */ /* arch-tag: 0c019735-d61b-4080-be85-4fdd6e50ae07
--- a/src/ChangeLog Mon Jul 26 01:23:49 2010 +0000 +++ b/src/ChangeLog Mon Jul 26 22:54:37 2010 +0000 @@ -1,3 +1,19 @@ +2010-07-26 Dan Nicolaescu <dann@ics.uci.edu> + + * keyboard.c (Ftop_level, Fexit_recursive_edit) + (Fabort_recursive_edit): Remove return statements in NO_RETURN + functions. + + * frame.h (Qtty_color_mode): Add declaration. + + * lisp.h (Ftop_level, Fexit_recursive_edit) + (Fabort_recursive_edit): Mark as NO_RETURN. + +2010-07-26 Kenichi Handa <handa@m17n.org> + + * font.c (Ffont_shape_gstring): Terminate GSTRING by nil if the + number of glyphs gets smaller than the original length. (Bug#6621) + 2010-07-26 Juanma Barranquero <lekktu@gmail.com> * lread.c (unreadpure, mapatoms_1): Make static.
--- a/src/font.c Mon Jul 26 01:23:49 2010 +0000 +++ b/src/font.c Mon Jul 26 22:54:37 2010 +0000 @@ -4459,6 +4459,8 @@ } if (i == 3 || XINT (n) == 0) return Qnil; + if (XINT (n) < LGSTRING_GLYPH_LEN (gstring)) + LGSTRING_SET_GLYPH (gstring, XINT (n), Qnil); glyph = LGSTRING_GLYPH (gstring, 0); from = LGLYPH_FROM (glyph);
--- a/src/frame.h Mon Jul 26 01:23:49 2010 +0000 +++ b/src/frame.h Mon Jul 26 22:54:37 2010 +0000 @@ -1089,6 +1089,7 @@ /* These are in frame.c */ +extern Lisp_Object Qtty_color_mode; extern Lisp_Object Vx_resource_name; extern Lisp_Object Vx_resource_class;
--- a/src/keyboard.c Mon Jul 26 01:23:49 2010 +0000 +++ b/src/keyboard.c Mon Jul 26 22:54:37 2010 +0000 @@ -1380,7 +1380,7 @@ while (INPUT_BLOCKED_P) UNBLOCK_INPUT; - return Fthrow (Qtop_level, Qnil); + Fthrow (Qtop_level, Qnil); } DEFUN ("exit-recursive-edit", Fexit_recursive_edit, Sexit_recursive_edit, 0, 0, "", @@ -1391,7 +1391,6 @@ Fthrow (Qexit, Qnil); error ("No recursive edit is in progress"); - return Qnil; } DEFUN ("abort-recursive-edit", Fabort_recursive_edit, Sabort_recursive_edit, 0, 0, "", @@ -1402,7 +1401,6 @@ Fthrow (Qexit, Qt); error ("No recursive edit is in progress"); - return Qnil; } #if defined (HAVE_MOUSE) || defined (HAVE_GPM)
--- a/src/lisp.h Mon Jul 26 01:23:49 2010 +0000 +++ b/src/lisp.h Mon Jul 26 22:54:37 2010 +0000 @@ -3155,7 +3155,9 @@ extern int input_pending; EXFUN (Fdiscard_input, 0); EXFUN (Frecursive_edit, 0); -EXFUN (Ftop_level, 0); +EXFUN (Ftop_level, 0) NO_RETURN; +EXFUN (Fexit_recursive_edit, 0) NO_RETURN; +EXFUN (Fabort_recursive_edit, 0) NO_RETURN; EXFUN (Fcommand_execute, 4); EXFUN (Finput_pending_p, 0); extern Lisp_Object menu_bar_items (Lisp_Object);