Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99849. ------------------------------------------------------------ revno: 99849 committer: Sam Steingold branch nick: trunk timestamp: Wed 2010-04-07 12:25:49 -0400 message: add ";;;###autoload" cookies diff: === modified file 'lisp/progmodes/bug-reference.el' --- lisp/progmodes/bug-reference.el 2010-04-02 17:24:37 +0000 +++ lisp/progmodes/bug-reference.el 2010-04-07 16:25:49 +0000 @@ -130,6 +130,7 @@ (widen) (bug-reference-unfontify (point-min) (point-max))))) +;;;###autoload (defun turn-on-bug-reference-mode () "Unconditionally turn bug reference mode on." (unless bug-reference-mode @@ -148,6 +149,7 @@ (widen) (bug-reference-unfontify (point-min) (point-max))))) +;;;###autoload (defun turn-on-bug-reference-prog-mode () "Unconditionally turn bug reference prog mode on." (unless bug-reference-prog-mode ------------------------------------------------------------ revno: 99848 committer: Sam Steingold branch nick: trunk timestamp: Wed 2010-04-07 12:20:35 -0400 message: (compilation-save-buffers-predicate): New custom variable. (compile, recompile): Pass it to `save-some-buffers'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-04-07 12:57:04 +0000 +++ lisp/ChangeLog 2010-04-07 16:20:35 +0000 @@ -1,3 +1,9 @@ +2010-04-07 Sam Steingold + + * progmodes/compile.el (compilation-save-buffers-predicate): New + custom variable. + (compile, recompile): Pass it to `save-some-buffers'. + 2010-04-07 Jan Djärv * wid-edit.el (widget-choose): Move cursor to the second line of === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2010-03-28 19:51:55 +0000 +++ lisp/progmodes/compile.el 2010-04-07 16:20:35 +0000 @@ -584,6 +584,21 @@ :group 'compilation) ;;;###autoload +(defcustom compilation-save-buffers-predicate nil + "The second argument (PRED) passed to `save-some-buffers' before compiling. +E.g., one can set this to + (lambda () + (string-prefix-p my-compilation-root (file-truename (buffer-file-name)))) +to limit saving to files located under `my-compilation-root'. +Note, that, in general, `compilation-directory' cannot be used instead +of `my-compilation-root' here." + :type '(choice + (const :tag "Default (save all file-visiting buffers)" nil) + (const :tag "Save all buffers" t) + function) + :group 'compilation) + +;;;###autoload (defcustom compilation-search-path '(nil) "List of directories to search for source files named in error messages. Elements should be directory names, not file names of directories. @@ -1097,7 +1112,8 @@ (consp current-prefix-arg))) (unless (equal command (eval compile-command)) (setq compile-command command)) - (save-some-buffers (not compilation-ask-about-save) nil) + (save-some-buffers (not compilation-ask-about-save) + compilation-save-buffers-predicate) (setq-default compilation-directory default-directory) (compilation-start command comint)) @@ -1108,7 +1124,8 @@ original use. Otherwise, recompile using `compile-command'. If the optional argument `edit-command' is non-nil, the command can be edited." (interactive "P") - (save-some-buffers (not compilation-ask-about-save) nil) + (save-some-buffers (not compilation-ask-about-save) + compilation-save-buffers-predicate) (let ((default-directory (or compilation-directory default-directory))) (when edit-command (setcar compilation-arguments ------------------------------------------------------------ revno: 99847 author: Christoph committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2010-04-07 15:43:04 +0200 message: * lib-src/makefile.w32-in: Use parenthesis for macros for nmake compatibility. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-04-03 02:23:51 +0000 +++ lib-src/ChangeLog 2010-04-07 13:43:04 +0000 @@ -1,3 +1,8 @@ +2010-04-07 Christoph (tiny change) + + * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis + for macros for nmake compatibility. + 2010-04-03 Juanma Barranquero Add stubs for Windows, required after CVE-2010-0825 change. === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2010-04-03 01:54:24 +0000 +++ lib-src/makefile.w32-in 2010-04-07 13:43:04 +0000 @@ -195,8 +195,8 @@ $(lispsource)term/pc-win.elc \ $(lispsource)x-dnd.elc \ $(lispsource)term/x-win.elc \ - ${lispsource}emacs-lisp/easymenu.elc \ - ${lispsource}term/ns-win.elc + $(lispsource)emacs-lisp/easymenu.elc \ + $(lispsource)term/ns-win.elc lisp1= \ ------------------------------------------------------------ revno: 99846 committer: Jan D. branch nick: trunk timestamp: Wed 2010-04-07 14:57:04 +0200 message: wid-edit.el (widget-choose): Put cursor on second line of the buffer (Bug#5695). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-04-07 05:56:35 +0000 +++ lisp/ChangeLog 2010-04-07 12:57:04 +0000 @@ -1,3 +1,8 @@ +2010-04-07 Jan Djärv + + * wid-edit.el (widget-choose): Move cursor to the second line of + the buffer (Bug#5695). + 2010-04-07 Dan Nicolaescu Add new VC methods: vc-log-incoming and vc-log-outgoing. === modified file 'lisp/wid-edit.el' --- lisp/wid-edit.el 2010-03-12 23:08:30 +0000 +++ lisp/wid-edit.el 2010-04-07 12:57:04 +0000 @@ -253,7 +253,9 @@ ;; Allocate digits to disabled alternatives ;; so that the digit of a given alternative never varies. (setq next-digit (1+ next-digit))) - (insert "\nC-g = Quit")) + (insert "\nC-g = Quit") + (goto-char (point-min)) + (forward-line)) (or some-choice-enabled (error "None of the choices is currently meaningful")) (define-key map [?\C-g] 'keyboard-quit) ------------------------------------------------------------ revno: 99845 [merge] committer: Jan D branch nick: trunk timestamp: Wed 2010-04-07 13:45:08 +0200 message: Fix resizing for X and non-Gtk+ build. Bug #5848. * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use FRAME_LINE_TO_PIXEL_Y. * xterm.c (x_set_window_size_1): Don't add border_width/height to pixelwidth/height. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-04-07 06:11:45 +0000 +++ src/ChangeLog 2010-04-07 11:39:26 +0000 @@ -1,3 +1,11 @@ +2010-04-07 Jan Djärv + + * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use + FRAME_LINE_TO_PIXEL_Y. + + * xterm.c (x_set_window_size_1): Don't add border_width/height to + pixelwidth/height. + 2010-04-07 Dan Nicolaescu Simplify code for HP machines. === modified file 'src/frame.h' --- src/frame.h 2010-01-13 08:35:10 +0000 +++ src/frame.h 2010-04-07 11:39:26 +0000 @@ -997,8 +997,8 @@ + FRAME_INTERNAL_BORDER_WIDTH (f)) #define FRAME_TEXT_LINES_TO_PIXEL_HEIGHT(f, lines) \ - (FRAME_LINE_TO_PIXEL_Y (f, lines) \ - + FRAME_INTERNAL_BORDER_WIDTH (f)) + ((lines) * FRAME_LINE_HEIGHT (f) \ + + 2 * FRAME_INTERNAL_BORDER_WIDTH (f)) /* Return the row/column (zero-based) of the character cell containing === modified file 'src/xterm.c' --- src/xterm.c 2010-04-02 03:10:33 +0000 +++ src/xterm.c 2010-04-07 11:39:26 +0000 @@ -8931,11 +8931,9 @@ compute_fringe_widths (f, 0); - pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols) - + 2*f->border_width; + pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) - + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f) - + 2*f->border_width; + + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); if (change_gravity) f->win_gravity = NorthWestGravity; x_wm_set_size_hint (f, (long) 0, 0); ------------------------------------------------------------ revno: 99844 committer: Dan Nicolaescu branch nick: trunk timestamp: Tue 2010-04-06 23:11:45 -0700 message: Simplify code for HP machines. * m/hp800.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, NO_REMAP): Do not define for GNU_LINUX, not needed. (UNEXEC, NEED_BSDTTY): Move definitions... * s/hpux10-20.h (UNEXEC, NEED_BSDTTY): ... here. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-04-07 06:01:30 +0000 +++ src/ChangeLog 2010-04-07 06:11:45 +0000 @@ -1,5 +1,11 @@ 2010-04-07 Dan Nicolaescu + Simplify code for HP machines. + * m/hp800.h (LOAD_AVE_TYPE, LOAD_AVE_CVT, NO_REMAP): Do not define + for GNU_LINUX, not needed. + (UNEXEC, NEED_BSDTTY): Move definitions... + * s/hpux10-20.h (UNEXEC, NEED_BSDTTY): ... here. + * m/iris4d.h (UNEXEC): Move definition ... * s/irix6-5.h (UNEXEC): ... here. === modified file 'src/m/hp800.h' --- src/m/hp800.h 2010-03-30 02:47:23 +0000 +++ src/m/hp800.h 2010-04-07 06:11:45 +0000 @@ -41,9 +41,9 @@ #define EXPLICIT_SIGN_EXTEND -/* Common definitions for HPUX and GNU/Linux. */ +/* Stuff for just HPUX. */ -#if defined (__hpux) || defined (GNU_LINUX) +#if defined (__hpux) /* Define NO_REMAP if memory segmentation makes it not work well to change the boundary between the text section and data section @@ -52,26 +52,6 @@ #define NO_REMAP -#endif /* __hpux or GNU_LINUX */ - -/* Stuff for just GNU/Linux. */ - -#ifdef GNU_LINUX - -/* Data type of load average, as read out of kmem. */ - -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ - -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - -#endif /* GNU_LINUX */ - -/* Stuff for just HPUX. */ - -#ifdef __hpux - /* Define VIRT_ADDR_VARIES if the virtual addresses of pure and impure space as loaded can vary, and even their relative order cannot be relied on. @@ -88,14 +68,6 @@ #define DATA_START 0x40000000 #define TEXT_START 0x00000000 -/* This machine requires completely different unexec code - which lives in a separate file. Specify the file name. */ - -#define UNEXEC unexhp9k800.o - -/* Include the file bsdtty.h, since this machine has job control. */ -#define NEED_BSDTTY - /* Data type of load average, as read out of kmem. */ #define LOAD_AVE_TYPE double === modified file 'src/s/hpux10-20.h' --- src/s/hpux10-20.h 2010-01-13 08:35:10 +0000 +++ src/s/hpux10-20.h 2010-04-07 06:11:45 +0000 @@ -89,6 +89,11 @@ #define HAVE_PERROR /* Delete this line for version 6. */ +#define UNEXEC unexhp9k800.o + +/* Include the file bsdtty.h, since this machine has job control. */ +#define NEED_BSDTTY + /* This is how to get the device name of the tty end of a pty. */ #define PTY_TTY_NAME_SPRINTF \ sprintf (pty_name, "/dev/pty/tty%c%x", c, i); ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.