Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99614. ------------------------------------------------------------ revno: 99614 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-03-04 19:01:38 -0800 message: Fix orgcard.tex pdf landscape format. * refcards/orgcard.tex: Use pdflayout.sty. * refcards/Makefile (orgcard.pdf): Special rule no longer needed. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-03-02 03:47:19 +0000 +++ etc/ChangeLog 2010-03-05 03:01:38 +0000 @@ -1,3 +1,8 @@ +2010-03-05 Glenn Morris + + * refcards/orgcard.tex: Use pdflayout.sty. + * refcards/Makefile (orgcard.pdf): Special rule no longer needed. + 2010-03-02 Glenn Morris * refcards/Makefile: For cs- and sk-, use pdfcsplain if available. === modified file 'etc/refcards/Makefile' --- etc/refcards/Makefile 2010-03-02 03:47:19 +0000 +++ etc/refcards/Makefile 2010-03-05 03:01:38 +0000 @@ -81,16 +81,11 @@ gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}' -## FIXME just pdftex produces portrait rather than landscape. -orgcard.pdf: orgcard.ps - ps2pdf $< - ## Everything not explicitly listed above. %.pdf: %.tex pdftex $< - ## dvi files. cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \ === modified file 'etc/refcards/orgcard.tex' --- etc/refcards/orgcard.tex 2010-03-01 02:36:15 +0000 +++ etc/refcards/orgcard.tex 2010-03-05 03:01:38 +0000 @@ -9,14 +9,17 @@ % This file can be printed with 1, 2, or 3 columns per page (see below). % Specify how many you want here. - \columnsperpage=3 % Set letterpaper to 0 for A4 paper, 1 for letter (US) paper. Useful % only when columnsperpage is 2 or 3. - \letterpaper=0 +% PDF output layout. 0 for A4, 1 for letter (US), a `l' is added for +% a landscape layout. +\input pdflayout.sty +\pdflayout=(0l) + % Nothing else needs to be changed below this line. % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005, % 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ------------------------------------------------------------ revno: 99613 committer: Juri Linkov branch nick: trunk timestamp: Wed 2010-03-03 21:23:20 +0200 message: Add a comment for the previous commit. diff: === modified file 'lisp/info.el' --- lisp/info.el 2010-03-02 21:15:46 +0000 +++ lisp/info.el 2010-03-03 19:23:20 +0000 @@ -3062,6 +3062,8 @@ num (1- num))) (Info-goto-node (nth 1 (car Info-index-alternatives))) (if (> (nth 3 (car Info-index-alternatives)) 0) + ;; Forward 2 lines less because `Info-find-node-2' initially + ;; puts point to the 2nd line. (forward-line (- (nth 3 (car Info-index-alternatives)) 2)) (forward-line 3) ; don't search in headers (let ((name (car (car Info-index-alternatives)))) ------------------------------------------------------------ revno: 99612 committer: Chong Yidong branch nick: trunk timestamp: Wed 2010-03-03 12:31:50 -0500 message: Fix keyboard macro key lookup (Bug#5481). * src/keymap.c (Fwhere_is_internal): Use Fequal to compare definitions, so that keyboard macros are correctly handled (Bug#5481). * lisp/macros.el (insert-kbd-macro): Look up keyboard macro using the definition, not the name (Bug#5481). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-03 04:11:15 +0000 +++ lisp/ChangeLog 2010-03-03 17:31:50 +0000 @@ -1,3 +1,8 @@ +2010-03-03 Chong Yidong + + * macros.el (insert-kbd-macro): Look up keyboard macro using the + definition, not the name (Bug#5481). + 2010-03-03 Štěpán Němec (tiny change) * subr.el (momentary-string-display): Don't overwrite the MESSAGE === modified file 'lisp/macros.el' --- lisp/macros.el 2010-02-04 05:14:36 +0000 +++ lisp/macros.el 2010-03-03 17:31:50 +0000 @@ -138,7 +138,8 @@ (prin1 definition (current-buffer)))) (insert ")\n") (if keys - (let ((keys (where-is-internal macroname '(keymap)))) + (let ((keys (where-is-internal (symbol-function macroname) + '(keymap)))) (while keys (insert "(global-set-key ") (prin1 (car keys) (current-buffer)) === modified file 'src/ChangeLog' --- src/ChangeLog 2010-03-02 20:35:44 +0000 +++ src/ChangeLog 2010-03-03 17:31:50 +0000 @@ -1,3 +1,9 @@ +2010-03-03 Chong Yidong + + * keymap.c (Fwhere_is_internal): Use Fequal to compare + definitions, so that keyboard macros are correctly handled + (Bug#5481). + 2010-03-02 Eli Zaretskii * coding.c (decode_coding_emacs_mule): Fixup pointers to buffer === modified file 'src/keymap.c' --- src/keymap.c 2010-01-24 08:42:22 +0000 +++ src/keymap.c 2010-03-03 17:31:50 +0000 @@ -1633,13 +1633,13 @@ /* If a mouse click position is given, our variables are based on the buffer clicked on, not the current buffer. So we may have to switch the buffer here. */ - + if (CONSP (position)) { Lisp_Object window; - + window = POSN_WINDOW (position); - + if (WINDOWP (window) && BUFFERP (XWINDOW (window)->buffer) && XBUFFER (XWINDOW (window)->buffer) != current_buffer) @@ -1651,14 +1651,14 @@ would not be a problem here, but it is easier to keep things the same. */ - + record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); - + set_buffer_internal (XBUFFER (XWINDOW (window)->buffer)); } } - keymaps = Fcons (current_global_map, Qnil); + keymaps = Fcons (current_global_map, Qnil); if (!NILP (olp)) { @@ -1685,8 +1685,8 @@ /* Get the buffer local maps, possibly overriden by text or overlay properties */ - local_map = get_local_map (pt, current_buffer, Qlocal_map); - keymap = get_local_map (pt, current_buffer, Qkeymap); + local_map = get_local_map (pt, current_buffer, Qlocal_map); + keymap = get_local_map (pt, current_buffer, Qkeymap); if (CONSP (position)) { @@ -1694,7 +1694,7 @@ /* For a mouse click, get the local text-property keymap of the place clicked on, rather than point. */ - + if (POSN_INBUFFER_P (position)) { Lisp_Object pos; @@ -1705,7 +1705,7 @@ { local_map = get_local_map (XINT (pos), current_buffer, Qlocal_map); - + keymap = get_local_map (XINT (pos), current_buffer, Qkeymap); } @@ -1716,12 +1716,12 @@ string displayed via the `display' property, consider `local-map' and `keymap' properties of that string. */ - + if (string = POSN_STRING (position), (CONSP (string) && STRINGP (XCAR (string)))) { Lisp_Object pos, map; - + pos = XCDR (string); string = XCAR (string); if (INTEGERP (pos) @@ -1737,7 +1737,7 @@ keymap = map; } } - + } if (!NILP (local_map)) @@ -2890,7 +2890,7 @@ CONSP (sequences))) { Lisp_Object sequence, function; - + sequence = XCAR (sequences); sequences = XCDR (sequences); @@ -2903,8 +2903,8 @@ Either nil or number as value from Flookup_key means undefined. */ - if (!EQ (shadow_lookup (keymaps, sequence, Qnil, remapped), - definition)) + if (NILP (Fequal (shadow_lookup (keymaps, sequence, Qnil, remapped), + definition))) continue; /* If the current sequence is a command remapping with @@ -2933,12 +2933,12 @@ Faset (sequence, make_number (ASIZE (sequence) - 1), build_string ("(any string)")); } - + /* It is a true unshadowed match. Record it, unless it's already been seen (as could happen when inheriting keymaps). */ if (NILP (Fmember (sequence, found))) found = Fcons (sequence, found); - + /* If firstonly is Qnon_ascii, then we can return the first binding we find. If firstonly is not Qnon_ascii but not nil, then we should return the first ascii-only binding ------------------------------------------------------------ revno: 99611 committer: Chong Yidong branch nick: trunk timestamp: Wed 2010-03-03 11:14:16 -0500 message: NEWS: Auto composition mode is still a minor mode. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-03-03 02:50:57 +0000 +++ etc/NEWS 2010-03-03 16:14:16 +0000 @@ -123,11 +123,6 @@ ** Function arguments in *Help* buffers are now shown in upper-case. Customize `help-downcase-arguments' to t to show them in lower-case. -** Delete Auto Composition Mode. Now the variable -`auto-composition-mode' is simply a buffer local variable. The -commands `auto-composition-mode' and `global-auto-composition-mode' -still works as before. - * Editing Changes in Emacs 23.2 ------------------------------------------------------------ revno: 99610 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-03-02 20:11:15 -0800 message: Mark previous ChangeLog entry as a tiny change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-03-03 03:58:26 +0000 +++ lisp/ChangeLog 2010-03-03 04:11:15 +0000 @@ -1,4 +1,4 @@ -2010-03-03 Štěpán Němec +2010-03-03 Štěpán Němec (tiny change) * subr.el (momentary-string-display): Don't overwrite the MESSAGE argument with a local variable. (Bug#5670)