Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 100650. ------------------------------------------------------------ revno: 100650 committer: Chong Yidong branch nick: trunk timestamp: Sat 2010-06-26 20:30:52 -0400 message: Change default-frame-alist and menu/tool-bar-mode interaction (Bug#2249). Don't add entries for `menu-bar-lines' and `tool-bar-lines' to `default-frame-alist' and `initial-frame-alist' at startup. Instead, use X resources to update the `menu-bar-mode' and `tool-bar-mode' variables at startup, and use them as defaults during frame creation. * lisp/frame.el (frame-notice-user-settings): Don't change default-frame-alist based on menu-bar-mode and tool-bar-mode, or vice versa. * lisp/menu-bar.el (menu-bar-mode): * lisp/tool-bar.el (tool-bar-mode): Don't change default-frame-alist. Set init-value to t. * lisp/startup.el (command-line): Use X resources to set the value of menu-bar-mode and tool-bar-mode, before calling frame-initialize. * src/frame.c (Vmenu_bar_mode, Vtool_bar_mode): New vars. * src/w32fns.c (Fx_create_frame): * src/nsfns.m (Fx_create_frame): Likewise. * src/xfns.c (Fx_create_frame): Don't consult X resouces when setting menu-bar-lines and tool-bar-lines. Use menu-bar-mode and tool-bar-mode, which are now set using these X resources at startup, to determine the defaults. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-06-17 02:08:10 +0000 +++ etc/NEWS 2010-06-27 00:30:52 +0000 @@ -275,6 +275,15 @@ ** Passing a nil argument to a minor mode function now turns the mode ON unconditionally. + +** During startup, Emacs no longer adds entries for `menu-bar-lines' +and `tool-bar-lines' to `default-frame-alist' and +`initial-frame-alist'. With these alist entries omitted, `make-frame' +checks the value of the variable `menu-bar-mode'/`tool-bar-mode' to +determine whether to create a menu-bar or tool-bar, respectively. +If the alist entries are added, they override the value of +`menu-bar-mode'/`tool-bar-mode'. + * Lisp changes in Emacs 24.1 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-26 12:11:06 +0000 +++ lisp/ChangeLog 2010-06-27 00:30:52 +0000 @@ -1,3 +1,16 @@ +2010-06-27 Chong Yidong + + * startup.el (command-line): Use X resources to set the value of + menu-bar-mode and tool-bar-mode, before calling frame-initialize. + + * menu-bar.el (menu-bar-mode): + * tool-bar.el (tool-bar-mode): Don't change default-frame-alist. + Set init-value to t. + + * frame.el (frame-notice-user-settings): Don't change + default-frame-alist based on menu-bar-mode and tool-bar-mode, or + vice versa (Bug#2249). + 2010-06-26 Eli Zaretskii * w32-fns.el (w32-convert-standard-filename): Doc fix. === modified file 'lisp/frame.el' --- lisp/frame.el 2010-06-25 19:32:37 +0000 +++ lisp/frame.el 2010-06-27 00:30:52 +0000 @@ -39,13 +39,6 @@ (defvar window-system-default-frame-alist nil "Alist of window-system dependent default frame parameters. -You can set this in your init file; for example, - - ;; Disable menubar and toolbar on the console, but enable them under X. - (setq window-system-default-frame-alist - '((x (menu-bar-lines . 1) (tool-bar-lines . 1)) - (nil (menu-bar-lines . 0) (tool-bar-lines . 0)))) - Parameters specified here supersede the values given in `default-frame-alist'.") @@ -287,36 +280,6 @@ React to settings of `initial-frame-alist', `window-system-default-frame-alist' and `default-frame-alist' there (in decreasing order of priority)." - ;; Make menu-bar-mode and default-frame-alist consistent. - (when (boundp 'menu-bar-mode) - (let ((default (assq 'menu-bar-lines default-frame-alist))) - (if default - (setq menu-bar-mode (not (eq (cdr default) 0))) - (setq default-frame-alist - (cons (cons 'menu-bar-lines (if menu-bar-mode 1 0)) - default-frame-alist))))) - - ;; Make tool-bar-mode and default-frame-alist consistent. Don't do - ;; it in batch mode since that would leave a tool-bar-lines - ;; parameter in default-frame-alist in a dumped Emacs, which is not - ;; what we want. - (when (and (boundp 'tool-bar-mode) - (not noninteractive)) - (let ((default (assq 'tool-bar-lines default-frame-alist))) - (if default - (setq tool-bar-mode (not (eq (cdr default) 0))) - ;; If Emacs was started on a tty, changing default-frame-alist - ;; would disable the toolbar on X frames created later. We - ;; want to keep the default of showing a toolbar under X even - ;; in this case. - ;; - ;; If the user explicitly called `tool-bar-mode' in .emacs, - ;; then default-frame-alist is already changed anyway. - (when initial-window-system - (setq default-frame-alist - (cons (cons 'tool-bar-lines (if tool-bar-mode 1 0)) - default-frame-alist)))))) - ;; Creating and deleting frames may shift the selected frame around, ;; and thus the current buffer. Protect against that. We don't ;; want to use save-excursion here, because that may also try to set === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2010-06-19 22:36:51 +0000 +++ lisp/menu-bar.el 2010-06-27 00:30:52 +0000 @@ -1924,28 +1924,20 @@ `(menu-item ,(purecopy "Previous History Item") previous-history-element :help ,(purecopy "Put previous minibuffer history element in the minibuffer")))) -;;;###autoload -;; This comment is taken from tool-bar.el near -;; (put 'tool-bar-mode ...) -;; We want to pretend the menu bar by standard is on, as this will make -;; customize consider disabling the menu bar a customization, and save -;; that. We could do this for real by setting :init-value below, but -;; that would overwrite disabling the tool bar from X resources. -(put 'menu-bar-mode 'standard-value '(t)) - (define-minor-mode menu-bar-mode "Toggle display of a menu bar on each frame. This command applies to all frames that exist and frames to be created in the future. With a numeric argument, if the argument is positive, turn on menu bars; otherwise, turn off menu bars." - :init-value nil + :init-value t :global t :group 'frames - ;; Make menu-bar-mode and default-frame-alist consistent. - (modify-all-frames-parameters (list (cons 'menu-bar-lines - (if menu-bar-mode 1 0)))) + ;; Turn the menu-bars on all frames on or off. + (let ((val (if menu-bar-mode 1 0))) + (dolist (frame (frame-list)) + (set-frame-parameter frame 'menu-bar-lines val))) ;; Make the message appear when Emacs is idle. We can not call message ;; directly. The minor-mode message "Menu-bar mode disabled" comes === modified file 'lisp/startup.el' --- lisp/startup.el 2010-06-17 02:08:10 +0000 +++ lisp/startup.el 2010-06-27 00:30:52 +0000 @@ -878,10 +878,32 @@ (run-hooks 'before-init-hook) - ;; Under X Window, this creates the X frame and deletes the terminal frame. + ;; Under X, this creates the X frame and deletes the terminal frame. (unless (daemonp) + ;; Enable or disable the tool-bar and menu-bar. + ;; While we're at it, set `no-blinking-cursor' too. + (cond + ((or noninteractive emacs-basic-display) + (setq menu-bar-mode nil + tool-bar-mode nil + no-blinking-cursor t)) + ;; Check X resources if available. + ((memq initial-window-system '(x w32 ns)) + (let ((no-vals '("no" "off" "false"))) + (if (member (x-get-resource "menuBar" "MenuBar") no-vals) + (setq menu-bar-mode nil)) + (if (member (x-get-resource "toolBar" "ToolBar") no-vals) + (setq tool-bar-mode nil)) + (if (member (x-get-resource "cursorBlink" "CursorBlink") + no-vals) + (setq no-blinking-cursor t))))) (frame-initialize)) + ;; Set up the tool-bar (even in tty frames, since Emacs might open a + ;; graphical frame later). + (unless noninteractive + (tool-bar-setup)) + ;; Turn off blinking cursor if so specified in X resources. This is here ;; only because all other settings of no-blinking-cursor are here. (unless (or noninteractive @@ -891,25 +913,6 @@ '("off" "false"))))) (setq no-blinking-cursor t)) - ;; If frame was created with a menu bar, set menu-bar-mode on. - (unless (or noninteractive - emacs-basic-display - (and (memq initial-window-system '(x w32)) - (<= (frame-parameter nil 'menu-bar-lines) 0))) - (menu-bar-mode 1)) - - (unless (or noninteractive (not (fboundp 'tool-bar-mode))) - ;; Set up the tool-bar. Do this even in tty frames, so that there - ;; is a tool-bar if Emacs later opens a graphical frame. - (if (or emacs-basic-display - (and (numberp (frame-parameter nil 'tool-bar-lines)) - (<= (frame-parameter nil 'tool-bar-lines) 0))) - ;; On a graphical display with the toolbar disabled via X - ;; resources, set up the toolbar without enabling it. - (tool-bar-setup) - ;; Otherwise, enable tool-bar-mode. - (tool-bar-mode 1))) - ;; Re-evaluate predefined variables whose initial value depends on ;; the runtime context. (mapc 'custom-reevaluate-setting === modified file 'lisp/tool-bar.el' --- lisp/tool-bar.el 2010-04-25 07:23:01 +0000 +++ lisp/tool-bar.el 2010-06-27 00:30:52 +0000 @@ -48,21 +48,17 @@ See `tool-bar-add-item' and `tool-bar-add-item-from-menu' for conveniently adding tool bar items." - :init-value nil + :init-value t :global t :group 'mouse :group 'frames - (if tool-bar-mode - (progn - ;; Make one tool-bar-line for any - including non-graphical - - ;; terminal, see Bug#1754. If this causes problems, we should - ;; handle the problem in `modify-frame-parameters' or do not - ;; call `modify-all-frames-parameters' when toggling the tool - ;; bar off either. - (modify-all-frames-parameters (list (cons 'tool-bar-lines 1))) - (if (= 1 (length (default-value 'tool-bar-map))) ; not yet setup - (tool-bar-setup))) - (modify-all-frames-parameters (list (cons 'tool-bar-lines 0))))) + ;; Make tool-bar even if terminal is non-graphical (Bug#1754). + (let ((val (if tool-bar-mode 1 0))) + (dolist (frame (frame-list)) + (set-frame-parameter frame 'tool-bar-lines val))) + (when tool-bar-mode + (if (= 1 (length (default-value 'tool-bar-map))) ; not yet setup + (tool-bar-setup)))) ;;;###autoload ;; Used in the Show/Hide menu, to have the toggle reflect the current frame. @@ -74,17 +70,6 @@ (tool-bar-mode (if (> (frame-parameter nil 'tool-bar-lines) 0) 0 1)) (tool-bar-mode arg))) -;;;###autoload -;; We want to pretend the toolbar by standard is on, as this will make -;; customize consider disabling the toolbar a customization, and save -;; that. We could do this for real by setting :init-value above, but -;; that would turn on the toolbar in MS Windows where it is currently -;; useless, and it would overwrite disabling the tool bar from X -;; resources. If anyone want to implement this in a cleaner way, -;; please do so. -;; -- Per Abrahamsen 2002-02-21. -(put 'tool-bar-mode 'standard-value '(t)) - (defvar tool-bar-map (make-sparse-keymap) "Keymap for the tool bar. Define this locally to override the global tool bar.") === modified file 'src/ChangeLog' --- src/ChangeLog 2010-06-25 19:32:37 +0000 +++ src/ChangeLog 2010-06-27 00:30:52 +0000 @@ -1,3 +1,15 @@ +2010-06-27 Chong Yidong + + * xfns.c (Fx_create_frame): Don't consult X resouces when setting + menu-bar-lines and tool-bar-lines. Use menu-bar-mode and + tool-bar-mode, which are now set using these X resources at + startup, to determine the defaults (Bug#2249). + + * w32fns.c (Fx_create_frame): + * nsfns.m (Fx_create_frame): Likewise. + + * frame.c (Vmenu_bar_mode, Vtool_bar_mode): New vars. + 2010-06-24 Juanma Barranquero * gtkutil.c (xg_update_scrollbar_pos): === modified file 'src/frame.c' --- src/frame.c 2010-06-25 19:32:37 +0000 +++ src/frame.c 2010-06-27 00:30:52 +0000 @@ -119,6 +119,7 @@ Lisp_Object Qexplicit_name; Lisp_Object Qunsplittable; Lisp_Object Qmenu_bar_lines, Qtool_bar_lines; +Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; Lisp_Object Qleft_fringe, Qright_fringe; Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; Lisp_Object Qtty_color_mode; @@ -4648,6 +4649,14 @@ Qdelete_frame_functions = intern_c_string ("delete-frame-functions"); staticpro (&Qdelete_frame_functions); + DEFVAR_LISP ("menu-bar-mode", &Vmenu_bar_mode, + doc: /* Non-nil if Menu-Bar mode is enabled. */); + Vmenu_bar_mode = Qt; + + DEFVAR_LISP ("tool-bar-mode", &Vtool_bar_mode, + doc: /* Non-nil if Tool-Bar mode is enabled. */); + Vtool_bar_mode = Qt; + DEFVAR_KBOARD ("default-minibuffer-frame", Vdefault_minibuffer_frame, doc: /* Minibufferless frames use this frame's minibuffer. === modified file 'src/nsfns.m' --- src/nsfns.m 2010-06-02 04:29:53 +0000 +++ src/nsfns.m 2010-06-27 00:30:52 +0000 @@ -1234,10 +1234,18 @@ init_frame_faces (f); - x_default_parameter (f, parms, Qmenu_bar_lines, make_number (0), "menuBar", - "menuBar", RES_TYPE_NUMBER); - x_default_parameter (f, parms, Qtool_bar_lines, make_number (0), "toolBar", - "toolBar", RES_TYPE_NUMBER); + /* The X resources controlling the menu-bar and tool-bar are + processed specially at startup, and reflected in the mode + variables; ignore them here. */ + x_default_parameter (f, parms, Qmenu_bar_lines, + NILP (Vmenu_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); + x_default_parameter (f, parms, Qtool_bar_lines, + NILP (Vtool_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); + x_default_parameter (f, parms, Qbuffer_predicate, Qnil, "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); x_default_parameter (f, parms, Qtitle, Qnil, "title", "Title", === modified file 'src/w32fns.c' --- src/w32fns.c 2010-05-11 21:02:32 +0000 +++ src/w32fns.c 2010-06-27 00:30:52 +0000 @@ -290,6 +290,7 @@ /* The below are defined in frame.c. */ +extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; extern Lisp_Object Vwindow_system_version; #ifdef GLYPH_DEBUG @@ -4462,10 +4463,17 @@ happen. */ init_frame_faces (f); - x_default_parameter (f, parameters, Qmenu_bar_lines, make_number (1), - "menuBar", "MenuBar", RES_TYPE_NUMBER); - x_default_parameter (f, parameters, Qtool_bar_lines, make_number (1), - "toolBar", "ToolBar", RES_TYPE_NUMBER); + /* The X resources controlling the menu-bar and tool-bar are + processed specially at startup, and reflected in the mode + variables; ignore them here. */ + x_default_parameter (f, parameters, Qmenu_bar_lines, + NILP (Vmenu_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); + x_default_parameter (f, parameters, Qtool_bar_lines, + NILP (Vtool_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); x_default_parameter (f, parameters, Qbuffer_predicate, Qnil, "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); === modified file 'src/xfns.c' --- src/xfns.c 2010-06-22 07:55:08 +0000 +++ src/xfns.c 2010-06-27 00:30:52 +0000 @@ -204,6 +204,8 @@ /* The below are defined in frame.c. */ +extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; + #if GLYPH_DEBUG int image_cache_refcount, dpyinfo_refcount; #endif @@ -3450,10 +3452,18 @@ happen. */ init_frame_faces (f); - x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1), - "menuBar", "MenuBar", RES_TYPE_BOOLEAN_NUMBER); - x_default_parameter (f, parms, Qtool_bar_lines, make_number (1), - "toolBar", "ToolBar", RES_TYPE_NUMBER); + /* The X resources controlling the menu-bar and tool-bar are + processed specially at startup, and reflected in the mode + variables; ignore them here. */ + x_default_parameter (f, parms, Qmenu_bar_lines, + NILP (Vmenu_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); + x_default_parameter (f, parms, Qtool_bar_lines, + NILP (Vtool_bar_mode) + ? make_number (0) : make_number (1), + NULL, NULL, RES_TYPE_NUMBER); + x_default_parameter (f, parms, Qbuffer_predicate, Qnil, "bufferPredicate", "BufferPredicate", RES_TYPE_SYMBOL); ------------------------------------------------------------ revno: 100649 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-06-26 17:41:12 +0300 message: Fix the MS-DOS build due to changes in configury. config.bat: Remove white space around "+" in COPY commands. msods/mainmake.v2 (version): Use emacs_version[] in src/emacs.c instead of lisp/version.el (see revno 100306). msdos/sed1v2.inp (MKDEPDIR): Edit to empty. Delete lines in rules that invoke $(MKDEPDIR). Fix editing rules that begin with "cd ../lisp". Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}. Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule. diff: === modified file 'ChangeLog' --- ChangeLog 2010-06-16 20:08:41 +0000 +++ ChangeLog 2010-06-26 14:36:27 +0000 @@ -1,3 +1,7 @@ +2010-06-26 Eli Zaretskii + + * config.bat: Remove white space around "+" in COPY commands. + 2010-06-16 Chong Yidong * INSTALL: Update font information (Bug#6389). === modified file 'config.bat' --- config.bat 2010-05-27 05:43:27 +0000 +++ config.bat 2010-06-26 14:36:27 +0000 @@ -191,7 +191,7 @@ rem Create "makefile" from "makefile.in". rm -f Makefile makefile.tmp -copy Makefile.in + deps.mk makefile.tmp +copy Makefile.in+deps.mk makefile.tmp sed -f ../msdos/sed1v2.inp Makefile rm -f makefile.tmp === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-06-03 22:16:02 +0000 +++ msdos/ChangeLog 2010-06-26 14:36:27 +0000 @@ -1,3 +1,14 @@ +2010-06-26 Eli Zaretskii + + * mainmake.v2 (version): Use emacs_version[] in src/emacs.c + instead of lisp/version.el (see revno 100306). + + * sed1v2.inp (MKDEPDIR): Edit to empty. + Delete lines in rules that invoke $(MKDEPDIR). + Fix editing rules that begin with "cd ../lisp". + Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}. + Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule. + 2010-06-03 Dan Nicolaescu * sed1v2.inp (UNEXEC_OBJ): Use UNEXEC_OBJ instead of unexec. === modified file 'msdos/mainmake.v2' --- msdos/mainmake.v2 2010-05-21 00:33:54 +0000 +++ msdos/mainmake.v2 2010-06-26 14:36:27 +0000 @@ -65,7 +65,7 @@ top_srcdir := $(subst \,/,$(shell cd)) # Find out which version of Emacs this is. -version := ${shell sed -n -e '/(defconst emacs-version/s/^[^"]*\("[^"]*"\).*/\1/p' lisp/version.el} +version := ${shell sed -n -e '/^const char emacs_version/s/^[^"]*\("[^"]*"\).*/\1/p' src/emacs.c} # Q: Do we need to bootstrap? # A: Only if we find admin/admin.el, i.e. we are building out of === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-06-03 22:16:02 +0000 +++ msdos/sed1v2.inp 2010-06-26 14:36:27 +0000 @@ -20,12 +20,6 @@ s/^[ \f\t][ \f\t]*$// s/^ / / s/\.h\.in/.h-in/ -/^ LC_ALL=C \$(RUN_TEMACS)/i\ - stubedit temacs.exe minstack=1024k -/^ LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/ -/-batch -l loadup/a\ - stubify emacs\ - stubedit emacs.exe minstack=2048k /^MAKE *=/s/^/# / /^SHELL *=/s/^/# / /^srcdir *=/s/@[^@\n]*@/./ @@ -124,7 +118,7 @@ /^UNEXEC_OBJ *=/s/@UNEXEC_OBJ@/unexec.o/ /^CANNOT_DUMP *=/s/@cannot_dump@/no/ /^DEPFLAGS *=/s/@DEPFLAGS@// -/^MKDEPDIR *=/s/@MKDEPDIR@/:/ +/^MKDEPDIR *=/s/@MKDEPDIR@// /^version *=/s/@[^@\n]*@// /^M_FILE *=/s!@[^@\n]*@!m/intel386.h! /^S_FILE *=/s!@[^@\n]*@!s/msdos.h! @@ -132,17 +126,29 @@ /^.\${libsrc}make-docfile.*>/s!make-docfile!make-docfile -o ../etc/DOC! /^.\${libsrc}make-doc/s!>.*$!! /^[ ]*$/d +/^ if test -f/,/^ fi$/c\ + command.com /c if exist .gdbinit rm -f _gdbinit /^temacs:/s/prefix-args// /^temacs:/s/stamp-oldxmenu// +/^ if test "\${CANNOT_DUMP}" =/,/^ else /d +/^ fi/d +/^ LC_ALL=C \$(RUN_TEMACS)/i\ + stubedit temacs.exe minstack=1024k +/^ *LC_ALL=C.*\$(RUN_TEMACS)/s/LC_ALL=C/set &;/ +/-batch -l loadup/a\ + stubify emacs\ + stubedit emacs.exe minstack=2048k +s/ || exit 1\; \\$// +s/ || true\; \\$// /^RUN_TEMACS *=/s|`/bin/pwd`|.| +/^ *@\$(MKDEPDIR) *$/d /^ mv \.\/\.gdbinit/d -/^ if test -f/c\ +/^ if test -f/,/^ fi$/c\ command.com /c if exist .gdbinit rm -f _gdbinit -/^ else mv \.\/\.gdbinit/d /^ #/d /^ cd.*make-docfile/s!$!; cd ${dot}${dot}/src! /^ @: /d -/^ -\{0,1\}ln -/s/ln -f/cp -pf/ +/^ -\{0,1\} *ln -/s/ln -f/cp -pf/ /^[ ]touch /s/touch/djecho $@ >/ s/@YMF_PASS_LDFLAGS@/flags/ s/@deps_frag@// @@ -162,7 +168,7 @@ stubedit b-emacs.exe minstack=3072k\ djecho bootlisp > bootlisp /^ -\{0,1\}rm -f/s/\\#/#/ -/^ @\{0,1\}cd ..\/lisp; /s|$|\; cd ../src| +/^ @\{0,1\}cd ..\/lisp;.*[^\]$/s|$|\; cd ../src| /^ echo.* buildobj.h/s|echo |djecho | # arch-tag: c7e3aacb-4162-460e-99f9-4252bca68d2c ------------------------------------------------------------ revno: 100648 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-06-26 15:21:24 +0300 message: Revert revno 100646 (fixed in emacs-23 branch). diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-06-26 12:01:31 +0000 +++ etc/ChangeLog 2010-06-26 12:21:24 +0000 @@ -1,7 +1,3 @@ -2010-06-26 Ken Brown - - * PROBLEMS: Update Cygwin-related info regarding GCC versions. - 2010-06-12 Glenn Morris * tutorials/TUTORIAL.bg, tutorials/TUTORIAL.es: Fix typos. === modified file 'etc/PROBLEMS' --- etc/PROBLEMS 2010-06-26 12:01:31 +0000 +++ etc/PROBLEMS 2010-06-26 12:21:24 +0000 @@ -2339,10 +2339,17 @@ (using the location of the 32-bit X libraries on your system). -*** Building Emacs for Cygwin can fail with GCC 3.x +*** Building the Cygwin port for MS-Windows can fail with some GCC versions -As of Emacs 22.1, there have been stability problems with Cygwin -builds of Emacs using GCC 3.x. Cygwin users are advised to use GCC 4. +Building Emacs 22 with Cygwin builds of GCC 3.4.4-1 and 3.4.4-2 is +reported to either fail or cause Emacs to segfault at run time. In +addition, the Cygwin GCC 3.4.4-2 has problems with generating debug +info. Cygwin users are advised not to use these versions of GCC for +compiling Emacs. GCC versions 4.0.3, 4.0.4, 4.1.1, and 4.1.2 +reportedly build a working Cygwin binary of Emacs, so we recommend +these GCC versions. Note that these versions of GCC, 4.0.3, 4.0.4, +4.1.1, and 4.1.2, are currently the _only_ versions known to succeed +in building Emacs (as of v22.1). *** Building the native MS-Windows port fails due to unresolved externals ------------------------------------------------------------ revno: 100647 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-06-26 15:11:06 +0300 message: w32-fns.el (w32-convert-standard-filename): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-25 19:32:37 +0000 +++ lisp/ChangeLog 2010-06-26 12:11:06 +0000 @@ -1,3 +1,7 @@ +2010-06-26 Eli Zaretskii + + * w32-fns.el (w32-convert-standard-filename): Doc fix. + 2010-06-25 Agustín Martín * flyspell.el (flyspell-check-previous-highlighted-word): Make === modified file 'lisp/w32-fns.el' --- lisp/w32-fns.el 2010-05-15 08:31:40 +0000 +++ lisp/w32-fns.el 2010-06-26 12:08:49 +0000 @@ -254,7 +254,7 @@ ;; (expand-file-name ".." exec-directory))))) (defun w32-convert-standard-filename (filename) - "Convert a standard file's name to something suitable for the MS-Windows. + "Convert a standard file's name to something suitable for MS-Windows. This means to guarantee valid names and perhaps to canonicalize certain patterns. ------------------------------------------------------------ revno: 100646 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-06-26 15:01:31 +0300 message: PROBLEMS: Update Cygwin-related info regarding GCC versions. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-06-16 20:08:41 +0000 +++ etc/ChangeLog 2010-06-26 12:01:31 +0000 @@ -1,3 +1,7 @@ +2010-06-26 Ken Brown + + * PROBLEMS: Update Cygwin-related info regarding GCC versions. + 2010-06-12 Glenn Morris * tutorials/TUTORIAL.bg, tutorials/TUTORIAL.es: Fix typos. === modified file 'etc/PROBLEMS' --- etc/PROBLEMS 2010-05-28 03:23:08 +0000 +++ etc/PROBLEMS 2010-06-26 12:01:31 +0000 @@ -2339,17 +2339,10 @@ (using the location of the 32-bit X libraries on your system). -*** Building the Cygwin port for MS-Windows can fail with some GCC versions +*** Building Emacs for Cygwin can fail with GCC 3.x -Building Emacs 22 with Cygwin builds of GCC 3.4.4-1 and 3.4.4-2 is -reported to either fail or cause Emacs to segfault at run time. In -addition, the Cygwin GCC 3.4.4-2 has problems with generating debug -info. Cygwin users are advised not to use these versions of GCC for -compiling Emacs. GCC versions 4.0.3, 4.0.4, 4.1.1, and 4.1.2 -reportedly build a working Cygwin binary of Emacs, so we recommend -these GCC versions. Note that these versions of GCC, 4.0.3, 4.0.4, -4.1.1, and 4.1.2, are currently the _only_ versions known to succeed -in building Emacs (as of v22.1). +As of Emacs 22.1, there have been stability problems with Cygwin +builds of Emacs using GCC 3.x. Cygwin users are advised to use GCC 4. *** Building the native MS-Windows port fails due to unresolved externals ------------------------------------------------------------ revno: 100645 author: Carsten Dominik committer: Romain Francoise branch nick: trunk timestamp: Sat 2010-06-26 11:53:06 +0200 message: Cherry-pick commit 8bd9308 from the org-mode Git repository. 2010-06-26 Carsten Dominik * org-agenda.el (org-agenda-goto-calendar): Do not bind obsolete variables. * org.el (calendar): Require calendar now on top level in org.el and define aliases to new variables when needed. (org-read-date, org-goto-calendar): Do not bind obsolete variables. diff: === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2010-06-22 07:51:46 +0000 +++ lisp/org/ChangeLog 2010-06-26 09:53:06 +0000 @@ -1,3 +1,13 @@ +2010-06-26 Carsten Dominik + + * org-agenda.el (org-agenda-goto-calendar): Do not bind obsolete + variables. + + * org.el (calendar): Require calendar now on top level in org.el + and define aliases to new variables when needed. + (org-read-date, org-goto-calendar): Do not bind obsolete + variables. + 2010-06-22 Glenn Morris * org-entities.el: Add explicit utf-8 coding cookie to file with === modified file 'lisp/org/org-agenda.el' --- lisp/org/org-agenda.el 2010-05-05 04:27:16 +0000 +++ lisp/org/org-agenda.el 2010-06-26 09:53:06 +0000 @@ -3981,7 +3981,6 @@ "Get the (Emacs Calendar) diary entries for DATE." (require 'diary-lib) (let* ((diary-fancy-buffer "*temporary-fancy-diary-buffer*") - (fancy-diary-buffer diary-fancy-buffer) (diary-display-hook '(fancy-diary-display)) (diary-display-function 'fancy-diary-display) (pop-up-frames nil) @@ -7312,9 +7311,7 @@ (date (calendar-gregorian-from-absolute day)) (calendar-move-hook nil) (calendar-view-holidays-initially-flag nil) - (calendar-view-diary-initially-flag nil) - (view-calendar-holidays-initially nil) - (view-diary-entries-initially nil)) + (calendar-view-diary-initially-flag nil)) (calendar) (calendar-goto-date date))) === modified file 'lisp/org/org.el' --- lisp/org/org.el 2010-05-26 14:19:15 +0000 +++ lisp/org/org.el 2010-06-26 09:53:06 +0000 @@ -72,8 +72,19 @@ (eval-when-compile (require 'cl) - (require 'gnus-sum) - (require 'calendar)) + (require 'gnus-sum)) + +(require 'calendar) +;; Emacs 22 calendar compatibility: Make sure the new variables are available +(unless (boundp 'calendar-view-holidays-initially-flag) + (defvaralias 'calendar-view-holidays-initially-flag + 'view-calendar-holidays-initially)) +(unless (boundp 'calendar-view-diary-initially-flag) + (defvaralias 'calendar-view-diary-initially-flag + 'view-diary-entries-initially)) +(unless (boundp 'diary-fancy-buffer) + (defvaralias 'diary-fancy-buffer 'fancy-diary-buffer)) + ;; For XEmacs, noutline is not yet provided by outline.el, so arrange for ;; the file noutline.el being loaded. (if (featurep 'xemacs) (condition-case nil (require 'noutline))) @@ -13516,9 +13527,7 @@ (calendar-frame-setup nil) (calendar-move-hook nil) (calendar-view-diary-initially-flag nil) - (view-diary-entries-initially nil) (calendar-view-holidays-initially-flag nil) - (view-calendar-holidays-initially nil) (timestr (format-time-string (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") def)) (prompt (concat (if prompt (concat prompt " ") "") @@ -14578,9 +14587,7 @@ (let ((tsr org-ts-regexp) diff (calendar-move-hook nil) (calendar-view-holidays-initially-flag nil) - (view-calendar-holidays-initially nil) - (calendar-view-diary-initially-flag nil) - (view-diary-entries-initially nil)) + (calendar-view-diary-initially-flag nil)) (if (or (org-at-timestamp-p) (save-excursion (beginning-of-line 1) ------------------------------------------------------------ revno: 100644 committer: Chong Yidong branch nick: trunk timestamp: Fri 2010-06-25 15:32:37 -0400 message: Revert last change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-06-25 19:24:05 +0000 +++ lisp/ChangeLog 2010-06-25 19:32:37 +0000 @@ -1,9 +1,3 @@ -2010-06-25 Chong Yidong - - * frame.el (initial-frame-alist): Give default value entries for - menu-bar-lines and tool-bar-lines consistent with the startup - default (Bug#2249). - 2010-06-25 Agustín Martín * flyspell.el (flyspell-check-previous-highlighted-word): Make === modified file 'lisp/frame.el' --- lisp/frame.el 2010-06-25 19:24:05 +0000 +++ lisp/frame.el 2010-06-25 19:32:37 +0000 @@ -52,8 +52,7 @@ ;; The initial value given here used to ask for a minibuffer. ;; But that's not necessary, because the default is to have one. ;; By not specifying it here, we let an X resource specify it. -(defcustom initial-frame-alist - '((menu-bar-lines . 1) (tool-bar-lines . 1)) +(defcustom initial-frame-alist nil "Alist of parameters for the initial X window frame. You can set this in your init file; for example, === modified file 'src/ChangeLog' --- src/ChangeLog 2010-06-25 19:24:05 +0000 +++ src/ChangeLog 2010-06-25 19:32:37 +0000 @@ -1,9 +1,3 @@ -2010-06-25 Chong Yidong - - * frame.c (Vdefault_frame_alist): Give default value entries for - menu-bar-lines and tool-bar-lines consistent with the startup - default (Bug#2249). - 2010-06-24 Juanma Barranquero * gtkutil.c (xg_update_scrollbar_pos): === modified file 'src/frame.c' --- src/frame.c 2010-06-25 19:24:05 +0000 +++ src/frame.c 2010-06-25 19:32:37 +0000 @@ -4595,8 +4595,7 @@ The `menu-bar-lines' element of the list controls whether new frames have menu bars; `menu-bar-mode' works by altering this element. Setting this variable does not affect existing frames, only new ones. */); - Vdefault_frame_alist = list2 (Fcons (Qmenu_bar_lines, make_number (1)), - Fcons (Qtool_bar_lines, make_number (1))); + Vdefault_frame_alist = Qnil; DEFVAR_LISP ("default-frame-scroll-bars", &Vdefault_frame_scroll_bars, doc: /* Default position of scroll bars on this window-system. */); ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.