Now on revision 105139. ------------------------------------------------------------ revno: 105139 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-07-12 15:39:01 -0400 message: Add Bug#2490 testcase to compilation.txt. diff: === modified file 'etc/compilation.txt' --- etc/compilation.txt 2011-07-03 21:39:49 +0000 +++ etc/compilation.txt 2011-07-12 19:39:01 +0000 @@ -254,6 +254,7 @@ foo.c:8-23: message foo.c:8-45.3: message foo.c:8.23-9.1: message +foo.el:3:1:Error: End of file during parsing jade:dbcommon.dsl:133:17:E: missing argument for function call G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found. file:G:/cygwin/dev/build-myproj.xml:54: Compiler Adapter 'javac' can't be found. ------------------------------------------------------------ revno: 105138 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-07-12 14:59:48 -0400 message: Adapt Mouse Sel mode to Emacs 24 mouse code. * lisp/mouse-sel.el: Hack restoring functionality, while keeping compatibility with 2010-07-03 changes to mouse selection. (mouse-sel-primary-overlay): New var. (mouse-sel-selection-alist): Use it. (mouse-sel-mode): Doc fix; remove points that are default features of mouse.el. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-12 14:40:56 +0000 +++ lisp/ChangeLog 2011-07-12 18:59:48 +0000 @@ -1,3 +1,12 @@ +2011-07-12 Chong Yidong + + * mouse-sel.el: Hack restoring functionality, while keeping + compatibility with 2010-07-03 changes to mouse selection. + (mouse-sel-primary-overlay): New var. + (mouse-sel-selection-alist): Use it. + (mouse-sel-mode): Doc fix; remove points that are default features + of mouse.el. + 2011-07-12 Johan Bockgård * progmodes/compile.el (compilation-error-regexp-alist-alist): === modified file 'lisp/mouse-sel.el' --- lisp/mouse-sel.el 2011-04-19 13:44:55 +0000 +++ lisp/mouse-sel.el 2011-07-12 18:59:48 +0000 @@ -202,14 +202,10 @@ With prefix ARG, turn Mouse Sel mode on if and only if ARG is positive. Returns the new status of Mouse Sel mode (non-nil means on). -When Mouse Sel mode is enabled, mouse selection is enhanced in various ways: - -- Clicking mouse-1 starts (cancels) selection, dragging extends it. - -- Clicking or dragging mouse-3 extends the selection as well. - -- Double-clicking on word constituents selects words. -Double-clicking on symbol constituents selects symbols. +When Mouse Sel mode is enabled, mouse selection is enhanced in +various ways: + +- Double-clicking on symbol constituents selects symbols. Double-clicking on quotes or parentheses selects sexps. Double-clicking on whitespace selects whitespace. Triple-clicking selects lines. @@ -224,14 +220,8 @@ - Clicking mouse-2 inserts the contents of the primary selection at the mouse position (or point, if `mouse-yank-at-point' is non-nil). -- Pressing mouse-2 while selecting or extending copies selection -to the kill ring. Pressing mouse-1 or mouse-3 kills it. - -- Double-clicking mouse-3 also kills selection. - -- M-mouse-1, M-mouse-2 & M-mouse-3 work similarly to mouse-1, mouse-2 -& mouse-3, but operate on the X secondary selection rather than the -primary selection and region." +- mouse-2 while selecting or extending copies selection to the +kill ring; mouse-1 or mouse-3 kills it." :global t :group 'mouse-sel (if mouse-sel-mode @@ -286,8 +276,17 @@ (setq mouse-secondary-overlay (make-overlay 1 1)) (overlay-put mouse-secondary-overlay 'face 'secondary-selection)) +(defconst mouse-sel-primary-overlay + (let ((ol (make-overlay (point-min) (point-min)))) + (delete-overlay ol) + (overlay-put ol 'face 'secondary-selection) + ol) + "An overlay which records the current primary selection. +This is used by Mouse Sel mode only.") + (defconst mouse-sel-selection-alist - '((SECONDARY mouse-secondary-overlay mouse-sel-secondary-thing)) + '((PRIMARY mouse-sel-primary-overlay mouse-sel-primary-thing) + (SECONDARY mouse-secondary-overlay mouse-sel-secondary-thing)) "Alist associating selections with variables. Each element is of the form: ------------------------------------------------------------ revno: 105137 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-07-12 13:33:18 -0400 message: Remove frame-local vars from Lisp manual; obsolete since Emacs 22.3. * display.texi (Window Systems): `window-system' is terminal-local. * doc/lispref/frames.texi (Frame Parameters, Parameter Access): Don't mention frame-local variables. * doc/lispref/variables.texi (Buffer-Local Variables): Don't mention obsolete frame-local variables. (Frame-Local Variables): Node deleted. * doc/lispref/elisp.texi (Top): Update node listing. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-07-12 12:50:42 +0000 +++ doc/lispref/ChangeLog 2011-07-12 17:33:18 +0000 @@ -1,3 +1,17 @@ +2011-07-12 Chong Yidong + + * display.texi (Window Systems): `window-system' is + terminal-local. + + * frames.texi (Frame Parameters, Parameter Access): Don't mention + frame-local variables. + + * variables.texi (Buffer-Local Variables): Don't mention obsolete + frame-local variables. + (Frame-Local Variables): Node deleted. + + * elisp.texi (Top): Update node listing. + 2011-07-12 Lars Magne Ingebrigtsen * elisp.texi: Change "inferiors" to "subnodes" in three places === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2011-07-06 02:42:10 +0000 +++ doc/lispref/display.texi 2011-07-12 17:33:18 +0000 @@ -5910,8 +5910,8 @@ concerned; the individual Emacs windows are not known to X at all. @defvar window-system -This frame-local variable tells Lisp programs what window system Emacs is using -for displaying the frame. The possible values are +This terminal-local variable tells Lisp programs what window system +Emacs is using for displaying the frame. The possible values are @table @code @item x === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2011-07-12 12:50:42 +0000 +++ doc/lispref/elisp.texi 2011-07-12 17:33:18 +0000 @@ -430,7 +430,6 @@ * File Local Variables:: Handling local variable lists in files. * Directory Local Variables:: Local variables common to all files in a directory. -* Frame-Local Variables:: Frame-local bindings for variables. * Variable Aliases:: Variables that are aliases for other variables. * Variables with Restricted Values:: Non-constant variables whose value can @emph{not} be an arbitrary Lisp object. === modified file 'doc/lispref/frames.texi' --- doc/lispref/frames.texi 2011-07-11 18:40:48 +0000 +++ doc/lispref/frames.texi 2011-07-12 17:33:18 +0000 @@ -337,9 +337,6 @@ If the terminal supports frame transparency, the parameter @code{alpha} is also meaningful. - You can use frame parameters to define frame-local bindings for -variables. @xref{Frame-Local Variables}. - @menu * Parameter Access:: How to change a frame's parameters. * Initial Parameters:: Specifying frame parameters when you make a frame. @@ -374,9 +371,6 @@ parameter. If you don't mention a parameter in @var{alist}, its value doesn't change. If @var{frame} is @code{nil}, it defaults to the selected frame. - -You can use this function to define frame-local bindings for -variables, see @ref{Frame-Local Variables}. @end defun @defun set-frame-parameter frame parm value === modified file 'doc/lispref/variables.texi' --- doc/lispref/variables.texi 2011-07-02 17:18:16 +0000 +++ doc/lispref/variables.texi 2011-07-12 17:33:18 +0000 @@ -39,7 +39,6 @@ * Buffer-Local Variables:: Variable values in effect only in one buffer. * File Local Variables:: Handling local variable lists in files. * Directory Local Variables:: Local variables common to all files in a directory. -* Frame-Local Variables:: Frame-local bindings for variables. * Variable Aliases:: Variables that are aliases for other variables. * Variables with Restricted Values:: Non-constant variables whose value can @emph{not} be an arbitrary Lisp object. @@ -1187,8 +1186,7 @@ @dfn{buffer-local} bindings, which apply only in one buffer. Having different values for a variable in different buffers is an important customization method. (Variables can also have bindings that are -local to each terminal, or to each frame. @xref{Multiple Terminals}, -and @xref{Frame-Local Variables}.) +local to each terminal. @xref{Multiple Terminals}.) @menu * Intro to Buffer-Local:: Introduction and concepts. @@ -1287,9 +1285,8 @@ values when you visit the file. @xref{File Variables,,, emacs, The GNU Emacs Manual}. - A buffer-local variable cannot be made frame-local -(@pxref{Frame-Local Variables}) or terminal-local (@pxref{Multiple -Terminals}). + A buffer-local variable cannot be made terminal-local +(@pxref{Multiple Terminals}). @node Creating Buffer-Local @subsection Creating and Deleting Buffer-Local Bindings @@ -1340,9 +1337,9 @@ because @code{let} does not distinguish between different kinds of bindings; it knows only which variable the binding was made for. -If the variable is terminal-local (@pxref{Multiple Terminals}), or -frame-local (@pxref{Frame-Local Variables}), this function signals an -error. Such variables cannot have buffer-local bindings as well. +If the variable is terminal-local (@pxref{Multiple Terminals}), this +function signals an error. Such variables cannot have buffer-local +bindings as well. @strong{Warning:} do not use @code{make-local-variable} for a hook variable. The hook variables are automatically made buffer-local as @@ -1880,36 +1877,6 @@ updates this list. @end defvar -@node Frame-Local Variables -@section Frame-Local Values for Variables -@cindex frame-local variables - - In addition to buffer-local variable bindings (@pxref{Buffer-Local -Variables}), Emacs supports @dfn{frame-local} bindings. A frame-local -binding for a variable is in effect in a frame for which it was -defined. - - In practice, frame-local variables have not proven very useful. -Ordinary frame parameters are generally used instead (@pxref{Frame -Parameters}). The function @code{make-variable-frame-local}, which -was used to define frame-local variables, has been deprecated since -Emacs 22.2. However, you can still define a frame-specific binding -for a variable @var{var} in frame @var{frame}, by setting the -@var{var} frame parameter for that frame: - -@lisp - (modify-frame-parameters @var{frame} '((@var{var} . @var{value}))) -@end lisp - -@noindent -This causes the variable @var{var} to be bound to the specified -@var{value} in the named @var{frame}. To check the frame-specific -values of such variables, use @code{frame-parameter}. @xref{Parameter -Access}. - - Note that you cannot have a frame-local binding for a variable that -has a buffer-local binding. - @node Variable Aliases @section Variable Aliases @cindex variable aliases ------------------------------------------------------------ revno: 105136 [merge] committer: Paul Eggert branch nick: trunk timestamp: Tue 2011-07-12 10:29:33 -0700 message: Merge: Fix minor new problems caught by GCC 4.6.1. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-07-12 03:04:06 +0000 +++ src/ChangeLog 2011-07-12 17:29:33 +0000 @@ -1,3 +1,11 @@ +2011-07-12 Paul Eggert + + Fix minor new problems caught by GCC 4.6.1. + * term.c (init_tty): Remove unused local. + * xsettings.c (store_monospaced_changed): Define this function only + if (defined HAVE_GSETTINGS || defined HAVE_GCONF), as it's + not used otherwise. + 2011-07-12 Chong Yidong * xdisp.c (Vresize_mini_windows): Minor doc fix (Bug#3300). === modified file 'src/term.c' --- src/term.c 2011-07-11 15:16:10 +0000 +++ src/term.c 2011-07-12 16:39:15 +0000 @@ -3097,7 +3097,6 @@ char *area = NULL; char **address = &area; int buffer_size = 4096; - register char *p = NULL; int status; struct tty_display_info *tty = NULL; struct terminal *terminal = NULL; === modified file 'src/xsettings.c' --- src/xsettings.c 2011-07-05 08:21:38 +0000 +++ src/xsettings.c 2011-07-12 16:47:56 +0000 @@ -83,7 +83,7 @@ /* Store a monospace font change event if the monospaced font changed. */ -#ifdef HAVE_XFT +#if defined HAVE_XFT && (defined HAVE_GSETTINGS || defined HAVE_GCONF) static void store_monospaced_changed (const char *newfont) { @@ -99,9 +99,11 @@ XCAR (first_dpyinfo->name_list_element)); } } +#endif /* Store a font name change event if the font name changed. */ +#ifdef HAVE_XFT static void store_font_name_changed (const char *newfont) { @@ -252,7 +254,7 @@ g_variant_unref (val); } } -#endif /* HAVE_XFT */ +#endif /* HAVE_XFT */ } #endif /* HAVE_GSETTINGS */ @@ -441,14 +443,14 @@ bytes_parsed += 4; /* Skip serial for this value */ if (bytes_parsed > bytes) return BadLength; - want_this = + want_this = #ifdef HAVE_XFT (nlen > 6 && strncmp (name, "Xft/", 4) == 0) || strcmp (XSETTINGS_FONT_NAME, name) == 0 || #endif strcmp (XSETTINGS_TOOL_BAR_STYLE, name) == 0; - + switch (type) { case 0: /* Integer */ ------------------------------------------------------------ revno: 105135 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-07-12 11:29:27 -0400 message: Move Dissociated Press section of manual into Amusements. * doc/emacs/misc.texi (Amusements): Move dissociated press here, from its own section. * doc/emacs/emacs.texi (Top): Update node listing. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-07-12 12:53:09 +0000 +++ doc/emacs/ChangeLog 2011-07-12 15:29:27 +0000 @@ -1,3 +1,10 @@ +2011-07-12 Chong Yidong + + * misc.texi (Amusements): Move dissociated press here, from its + own section. + + * emacs.texi (Top): Update node listing. + 2011-07-12 Lars Magne Ingebrigtsen * emacs.texi (Top): Change "inferiors" to "subnodes" for greater === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2011-07-12 12:53:09 +0000 +++ doc/emacs/emacs.texi 2011-07-12 15:29:27 +0000 @@ -219,7 +219,6 @@ "recursive editing level". * Emulation:: Emulating some other editors with Emacs. * Hyperlinking:: Following links in buffers. -* Dissociated Press:: Dissociating text for fun. * Amusements:: Various games and hacks. * Customization:: Modifying the behavior of Emacs. === modified file 'doc/emacs/misc.texi' --- doc/emacs/misc.texi 2011-07-12 01:38:28 +0000 +++ doc/emacs/misc.texi 2011-07-12 15:29:27 +0000 @@ -2572,7 +2572,7 @@ key bindings. @end table -@node Hyperlinking, Dissociated Press, Emulation, Top +@node Hyperlinking, Amusements, Emulation, Top @section Hyperlinking and Navigation Features @cindex hyperlinking @@ -2738,81 +2738,14 @@ find the one you select (@code{ffap-menu}). @end table -@node Dissociated Press, Amusements, Hyperlinking, Top -@section Dissociated Press - -@findex dissociated-press - @kbd{M-x dissociated-press} is a command for scrambling a file of text -either word by word or character by character. Starting from a buffer of -straight English, it produces extremely amusing output. The input comes -from the current Emacs buffer. Dissociated Press writes its output in a -buffer named @samp{*Dissociation*}, and redisplays that buffer after every -couple of lines (approximately) so you can read the output as it comes out. - - Dissociated Press asks every so often whether to continue generating -output. Answer @kbd{n} to stop it. You can also stop at any time by -typing @kbd{C-g}. The dissociation output remains in the -@samp{*Dissociation*} buffer for you to copy elsewhere if you wish. - -@cindex presidentagon - Dissociated Press operates by jumping at random from one point in -the buffer to another. In order to produce plausible output rather -than gibberish, it insists on a certain amount of overlap between the -end of one run of consecutive words or characters and the start of the -next. That is, if it has just output `president' and then decides to -jump to a different point in the buffer, it might spot the `ent' in -`pentagon' and continue from there, producing `presidentagon'. Long -sample texts produce the best results. - -@cindex againformation - A positive argument to @kbd{M-x dissociated-press} tells it to operate -character by character, and specifies the number of overlap characters. A -negative argument tells it to operate word by word, and specifies the number -of overlap words. In this mode, whole words are treated as the elements to -be permuted, rather than characters. No argument is equivalent to an -argument of two. For your againformation, the output goes only into the -buffer @samp{*Dissociation*}. The buffer you start with is not changed. - -@cindex Markov chain -@cindex ignoriginal -@cindex techniquitous - Dissociated Press produces results fairly like those of a Markov -chain based on a frequency table constructed from the sample text. It -is, however, an independent, ignoriginal invention. Dissociated Press -techniquitously copies several consecutive characters from the sample -text between random jumps, unlike a Markov chain which would jump -randomly after each word or character. This makes for more plausible -sounding results, and runs faster. - -@cindex outragedy -@cindex buggestion -@cindex properbose -@cindex mustatement -@cindex developediment -@cindex userenced - It is a mustatement that too much use of Dissociated Press can be a -developediment to your real work, sometimes to the point of outragedy. -And keep dissociwords out of your documentation, if you want it to be well -userenced and properbose. Have fun. Your buggestions are welcome. - -@node Amusements, Customization, Dissociated Press, Top +@node Amusements, Customization, Hyperlinking, Top @section Other Amusements @cindex boredom -@findex hanoi -@findex gomoku -@cindex tower of Hanoi - - If you are a little bit bored, you can try @kbd{M-x hanoi}. If you are -considerably bored, give it a numeric argument. If you are very, very -bored, try an argument of 9. Sit back and watch. - -@cindex Go Moku - If you want a little more personal involvement, try @kbd{M-x gomoku}, -which plays the game Go Moku with you. - -@findex bubbles - @kbd{M-x bubbles} is a game in which the object is to remove as many -bubbles as you can in the smallest number of moves. + +@findex animate-birthday-present +@cindex animate + The @code{animate} package makes text dance. For an example, try +@kbd{M-x animate-birthday-present}. @findex blackbox @findex mpuz @@ -2825,70 +2758,82 @@ guess---to guess a value, type a letter and then the digit you think it stands for. The aim of @code{5x5} is to fill in all the squares. +@findex bubbles + @kbd{M-x bubbles} is a game in which the object is to remove as many +bubbles as you can in the smallest number of moves. + @findex decipher @cindex ciphers @cindex cryptanalysis -@kbd{M-x decipher} helps you to cryptanalyze a buffer which is encrypted -in a simple monoalphabetic substitution cipher. + @kbd{M-x decipher} helps you to cryptanalyze a buffer which is +encrypted in a simple monoalphabetic substitution cipher. + +@findex dissociated-press + @kbd{M-x dissociated-press} scrambles the text in the current Emacs +buffer, word by word or character by character, writing its output to +a buffer named @samp{*Dissociation*}. A positive argument tells it to +operate character by character, and specifies the number of overlap +characters. A negative argument tells it to operate word by word, and +specifies the number of overlap words. Dissociated Press produces +results fairly like those of a Markov chain, but is however, an +independent, ignoriginal invention; it techniquitously copies several +consecutive characters from the sample text between random jumps, +unlike a Markov chain which would jump randomly after each word or +character. Keep dissociwords out of your documentation, if you want +it to be well userenced and properbose. @findex dunnet - @kbd{M-x dunnet} runs an adventure-style exploration game, which is -a bigger sort of puzzle. + @kbd{M-x dunnet} runs an text-based adventure game. + +@findex gomoku +@cindex Go Moku + If you want a little more personal involvement, try @kbd{M-x gomoku}, +which plays the game Go Moku with you. + +@cindex tower of Hanoi +@findex hanoi + If you are a little bit bored, you can try @kbd{M-x hanoi}. If you are +considerably bored, give it a numeric argument. If you are very, very +bored, try an argument of 9. Sit back and watch. + +@findex life +@cindex Life + @kbd{M-x life} runs Conway's ``Life'' cellular automaton. @findex lm @cindex landmark game -@kbd{M-x lm} runs a relatively non-participatory game in which a robot -attempts to maneuver towards a tree at the center of the window based on -unique olfactory cues from each of the four directions. - -@findex life -@cindex Life -@kbd{M-x life} runs Conway's ``Life'' cellular automaton. + @kbd{M-x lm} runs a relatively non-participatory game in which a +robot attempts to maneuver towards a tree at the center of the window +based on unique olfactory cues from each of the four directions. @findex morse-region @findex unmorse-region @cindex Morse code @cindex --/---/.-./.../. -@kbd{M-x morse-region} converts text in a region to Morse code and + @kbd{M-x morse-region} converts text in a region to Morse code and @kbd{M-x unmorse-region} converts it back. No cause for remorse. @findex pong @cindex Pong game -@kbd{M-x pong} plays a Pong-like game, bouncing the ball off opposing -bats. - -@findex solitaire -@cindex solitaire -@kbd{M-x solitaire} plays a game of solitaire in which you jump pegs -across other pegs. - -@findex animate-birthday-present -@cindex animate -The @code{animate} package makes text dance. For an example, try -@kbd{M-x animate-birthday-present}. - -@findex studlify-region -@cindex StudlyCaps -@kbd{M-x studlify-region} studlify-cases the region, producing -text like this: - -@example -M-x stUdlIfY-RegioN stUdlIfY-CaSeS thE region. -@end example - @findex tetris @cindex Tetris @findex snake @cindex Snake -@kbd{M-x tetris} runs an implementation of the well-known Tetris game. -Likewise, @kbd{M-x snake} provides an implementation of Snake. + @kbd{M-x pong}, @kbd{M-x snake} and @kbd{M-x tetris} are +implementations of the well-known Pong, Snake and Tetris games. - When you are frustrated, try the famous Eliza program. Just do -@kbd{M-x doctor}. End each input by typing @key{RET} twice. +@findex solitaire +@cindex solitaire + @kbd{M-x solitaire} plays a game of solitaire in which you jump pegs +across other pegs. @findex zone -The command @kbd{M-x zone} plays games with the display when Emacs is -idle. + The command @kbd{M-x zone} plays games with the display when Emacs +is idle. + + Finally, if you find yourself frustrated, try the famous Eliza +program. Just do @kbd{M-x doctor}. End each input by typing +@key{RET} twice. @ifnottex @lowersections ------------------------------------------------------------ revno: 105134 fixes bug(s): http://debbugs.gnu.org/2490 committer: Johan Bockgård branch nick: trunk timestamp: Tue 2011-07-12 16:40:56 +0200 message: * progmodes/compile.el (compilation-error-regexp-alist-alist): Fix previous fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-12 13:37:38 +0000 +++ lisp/ChangeLog 2011-07-12 14:40:56 +0000 @@ -1,3 +1,8 @@ +2011-07-12 Johan Bockgård + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + Fix previous fix (bug#2490). + 2011-07-12 Roland Winkler * textmodes/bibtex.el (bibtex-initialize): Use === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2011-07-12 12:28:35 +0000 +++ lisp/progmodes/compile.el 2011-07-12 14:40:56 +0000 @@ -251,9 +251,9 @@ \\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\): ?\ \\([0-9]+\\)\\(?:[.:]\\([0-9]+\\)\\)?\ \\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\ -\\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\|[Ee]rror\\)\\|\ +\\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\ *\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\ -\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)" + *[Ee]rror\\|\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)" 1 (2 . 4) (3 . 5) (6 . 7)) (lcc ------------------------------------------------------------ revno: 105133 committer: Roland Winkler branch nick: trunk timestamp: Tue 2011-07-12 08:37:38 -0500 message: lisp/textmodes/bibtex.el: small bug fixes diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-12 13:01:20 +0000 +++ lisp/ChangeLog 2011-07-12 13:37:38 +0000 @@ -1,3 +1,9 @@ +2011-07-12 Roland Winkler + + * textmodes/bibtex.el (bibtex-initialize): Use + pop-to-buffer-same-window. + (bibtex-search-entries): Fix interactive call. + 2011-07-12 Lars Magne Ingebrigtsen * progmodes/compile.el (compilation-error-regexp-alist-alist): === modified file 'lisp/textmodes/bibtex.el' --- lisp/textmodes/bibtex.el 2011-07-05 17:44:15 +0000 +++ lisp/textmodes/bibtex.el 2011-07-12 13:37:38 +0000 @@ -3060,7 +3060,7 @@ ;; select BibTeX buffer (if select (if buffer-list - (switch-to-buffer + (pop-to-buffer-same-window (completing-read "Switch to BibTeX buffer: " (mapcar 'buffer-name buffer-list) nil t @@ -5179,7 +5179,7 @@ (delete-dups (apply 'append bibtex-user-optional-fields - (mapcar (lambda (x) (mapcar 'car (apply 'append (cdr x)))) + (mapcar (lambda (x) (mapcar 'car (apply 'append (nthcdr 2 x)))) bibtex-entry-alist))) nil t) (read-string "Regexp: ") (if bibtex-search-entry-globally ------------------------------------------------------------ revno: 105132 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2011-07-12 15:01:20 +0200 message: Revert last patch, which wasn't correct. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-12 12:58:24 +0000 +++ lisp/ChangeLog 2011-07-12 13:01:20 +0000 @@ -1,8 +1,5 @@ 2011-07-12 Lars Magne Ingebrigtsen - * menu-bar.el (menu-set-font): Clarify that the default will be - saved (bug#3527). - * progmodes/compile.el (compilation-error-regexp-alist-alist): Fontise bytecomp Error lines more correctly (bug#2490). Fix suggested by Johan Bockgård. === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2011-07-12 12:58:24 +0000 +++ lisp/menu-bar.el 2011-07-12 13:01:20 +0000 @@ -673,8 +673,7 @@ ;; Function for setting/saving default font. (defun menu-set-font () - "Interactively select a font and make it the default. -This new default will be saved for future Emacs sessions." + "Interactively select a font and make it the default." (interactive) (let ((font (if (fboundp 'x-select-font) (x-select-font) ------------------------------------------------------------ revno: 105131 fixes bug(s): http://debbugs.gnu.org/3527 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Tue 2011-07-12 14:58:24 +0200 message: (menu-set-font): Clarify that the default will be saved diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-07-12 12:28:35 +0000 +++ lisp/ChangeLog 2011-07-12 12:58:24 +0000 @@ -1,5 +1,8 @@ 2011-07-12 Lars Magne Ingebrigtsen + * menu-bar.el (menu-set-font): Clarify that the default will be + saved (bug#3527). + * progmodes/compile.el (compilation-error-regexp-alist-alist): Fontise bytecomp Error lines more correctly (bug#2490). Fix suggested by Johan Bockgård. === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2011-07-07 22:41:09 +0000 +++ lisp/menu-bar.el 2011-07-12 12:58:24 +0000 @@ -673,7 +673,8 @@ ;; Function for setting/saving default font. (defun menu-set-font () - "Interactively select a font and make it the default." + "Interactively select a font and make it the default. +This new default will be saved for future Emacs sessions." (interactive) (let ((font (if (fboundp 'x-select-font) (x-select-font) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.