Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99409. ------------------------------------------------------------ revno: 99409 committer: Glenn Morris branch nick: trunk timestamp: Thu 2010-01-28 23:19:22 -0800 message: Explain mbox folder links. diff: === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2010-01-28 05:15:52 +0000 +++ admin/notes/bugtracker 2010-01-29 07:19:22 +0000 @@ -392,6 +392,17 @@ Or use the static index: http://debbugs.gnu.org/db/ix/full.html +** What are those "mbox folder" links on the bug report pages? + +"mbox folder" = messages as they arrived at the tracker + +"status mbox" = as above, but with a fake message at the start + summarizing the bug status + +"maintainer mbox" = messages as sent out from the tracker to the + maintainers (ie, bug-gnu-emacs). These have some changed headers + (Resent-*, Subject, etc). + ** ChangeLog issues *** When you fix a bug, it can be helpful to put the bug number in the ------------------------------------------------------------ revno: 99408 committer: Stefan Monnier branch nick: trunk timestamp: Thu 2010-01-28 16:55:43 -0500 message: Fix up spurious execute-bit on net/tramp.el diff: === modified file 'lisp/net/tramp.el' (properties changed: +x to -x) ------------------------------------------------------------ revno: 99407 committer: Michael Albinus branch nick: trunk timestamp: Thu 2010-01-28 22:13:01 +0100 message: * net/ange-ftp.el (ange-ftp-insert-directory): Handle the case, FILENAME is not in `default-directory'. (Bug#5478) * net/tramp.el (tramp-handle-insert-directory): Simplify handling of SWITCHES. Handle the case, FILENAME is not in `default-directory'. (Bug#5478) (tramp-register-file-name-handlers): Add safe-magic property. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-28 20:06:36 +0000 +++ lisp/ChangeLog 2010-01-28 21:13:01 +0000 @@ -1,3 +1,13 @@ +2010-01-28 Michael Albinus + + * net/ange-ftp.el (ange-ftp-insert-directory): Handle the case, + FILENAME is not in `default-directory'. (Bug#5478) + + * net/tramp.el (tramp-handle-insert-directory): Simplify handling + of SWITCHES. Handle the case, FILENAME is not in + `default-directory'. (Bug#5478) + (tramp-register-file-name-handlers): Add safe-magic property. + 2010-01-28 Chong Yidong * arc-mode.el (archive-zip-extract): Quote the argument passed to === modified file 'lisp/net/ange-ftp.el' --- lisp/net/ange-ftp.el 2010-01-13 08:35:10 +0000 +++ lisp/net/ange-ftp.el 2010-01-28 21:13:01 +0000 @@ -4542,7 +4542,18 @@ (if (string-match (concat "^.+[^ ] " (regexp-quote filename) "\\( -> .*\\)?[@/*=]?\n") dirlist) (match-string 0 dirlist) - ""))))))) + ""))))) + + ;; The inserted file could be from somewhere else. + (when (and (not wildcard) (not full) + (search-backward + (if (zerop (length (file-name-nondirectory + (expand-file-name file)))) + "." + (file-name-nondirectory file)) + nil 'noerror)) + (replace-match (file-relative-name (expand-file-name file)) t) + (goto-char (point-max))))) (defun ange-ftp-dired-uncache (dir) (if (ange-ftp-ftp-name (expand-file-name dir)) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2010-01-28 06:06:41 +0000 +++ lisp/net/tramp.el 2010-01-28 21:13:01 +0000 @@ -4062,26 +4062,25 @@ (not (symbol-value 'ls-lisp-use-insert-directory-program))) (tramp-run-real-handler 'insert-directory (list filename switches wildcard full-directory-p)) - (when (and (string-match "^--dired\\s-+" switches) + (when (stringp switches) + (setq switches (split-string switches))) + (when (and (member "--dired" switches) (not (tramp-get-ls-command-with-dired v))) - (setq switches (replace-match "" nil t switches))) - (tramp-message - v 4 "Inserting directory `ls %s %s', wildcard %s, fulldir %s" - switches filename (if wildcard "yes" "no") - (if full-directory-p "yes" "no")) + (setq switches (delete "--dired" switches))) (when wildcard (setq wildcard (tramp-run-real-handler 'file-name-nondirectory (list localname))) (setq localname (tramp-run-real-handler 'file-name-directory (list localname)))) - (when (listp switches) - (setq switches (mapconcat 'identity switches " "))) (unless full-directory-p - (setq switches (concat "-d " switches))) + (setq switches (add-to-list 'switches "-d" 'append))) + (setq switches (mapconcat 'tramp-shell-quote-argument switches " ")) (when wildcard - (setq switches (concat switches " " wildcard))) - (when (string-match "'" switches) - (setq switches (replace-match "\\\\'" nil nil switches))) + (setq switches (concat switches " " wildcard))) + (tramp-message + v 4 "Inserting directory `ls %s %s', wildcard %s, fulldir %s" + switches filename (if wildcard "yes" "no") + (if full-directory-p "yes" "no")) ;; If `full-directory-p', we just say `ls -l FILENAME'. ;; Else we chdir to the parent directory, then say `ls -ld BASENAME'. (if full-directory-p @@ -4144,6 +4143,17 @@ (while (looking-at "//") (forward-line 1) (delete-region (match-beginning 0) (point))) + + ;; The inserted file could be from somewhere else. + (when (and (not wildcard) (not full-directory-p)) + (goto-char (point-max)) + (search-backward + (if (zerop (length (file-name-nondirectory filename))) + "." + (file-name-nondirectory filename)) + beg 'noerror) + (replace-match (file-relative-name filename) t)) + (goto-char (point-max)))))) (defun tramp-handle-unhandled-file-name-directory (filename) @@ -5481,6 +5491,7 @@ ;; Add the handlers. (add-to-list 'file-name-handler-alist (cons tramp-file-name-regexp 'tramp-file-name-handler)) + (put 'tramp-file-name-handler 'safe-magic t) (add-to-list 'file-name-handler-alist (cons tramp-completion-file-name-regexp 'tramp-completion-file-name-handler)) ------------------------------------------------------------ revno: 99406 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-01-28 15:06:36 -0500 message: * arc-mode.el (archive-zip-extract): Quote the argument passed to unzip (Bug#5475). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-28 19:53:11 +0000 +++ lisp/ChangeLog 2010-01-28 20:06:36 +0000 @@ -1,3 +1,8 @@ +2010-01-28 Chong Yidong + + * arc-mode.el (archive-zip-extract): Quote the argument passed to + unzip (Bug#5475). + 2010-01-28 Nil Geisweiller (tiny change) * progmodes/flymake.el (flymake-allowed-file-name-masks) === modified file 'lisp/arc-mode.el' --- lisp/arc-mode.el 2010-01-13 08:35:10 +0000 +++ lisp/arc-mode.el 2010-01-28 20:06:36 +0000 @@ -1784,7 +1784,10 @@ (defun archive-zip-extract (archive name) (if (equal (car archive-zip-extract) "pkzip") (archive-*-extract archive name archive-zip-extract) - (archive-extract-by-stdout archive name archive-zip-extract))) + ;; unzip expands wildcards in NAME, so we need to quote it. + ;; FIXME: Does pkzip need similar treatment? + (archive-extract-by-stdout archive (shell-quote-argument name) + archive-zip-extract))) (defun archive-zip-write-file-member (archive descr) (archive-*-write-file-member ------------------------------------------------------------ revno: 99405 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-01-28 14:53:11 -0500 message: Flymake fix to handle more C++ filenames (Bug#5488). * progmodes/flymake.el (flymake-allowed-file-name-masks) (flymake-master-make-header-init): Add other C++ filename masks. (flymake-find-possible-master-files) (flymake-check-patch-master-file-buffer): Doc fixes (Bug#5488). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-01-28 06:06:41 +0000 +++ lisp/ChangeLog 2010-01-28 19:53:11 +0000 @@ -1,3 +1,10 @@ +2010-01-28 Nil Geisweiller (tiny change) + + * progmodes/flymake.el (flymake-allowed-file-name-masks) + (flymake-master-make-header-init): Add other C++ filename masks. + (flymake-find-possible-master-files) + (flymake-check-patch-master-file-buffer): Doc fixes (Bug#5488). + 2010-01-28 Michael Albinus Fix some busybox annoyances. === modified file 'lisp/progmodes/flymake.el' --- lisp/progmodes/flymake.el 2010-01-14 18:49:53 +0000 +++ lisp/progmodes/flymake.el 2010-01-28 19:53:11 +0000 @@ -269,8 +269,7 @@ :group 'tools) (defcustom flymake-allowed-file-name-masks - '(("\\.c\\'" flymake-simple-make-init) - ("\\.cpp\\'" flymake-simple-make-init) + '(("\\.\\(?:c\\(?:pp\\|xx\\|\\+\\+\\)?\\|CC\\)\\'" flymake-simple-make-init) ("\\.xml\\'" flymake-xml-init) ("\\.html?\\'" flymake-xml-init) ("\\.cs\\'" flymake-simple-make-init) @@ -291,7 +290,7 @@ ;; ("[ \t]*\\input[ \t]*{\\(.*\\)\\(%s\\)}" 1 2 )) ;; ("\\.tex\\'" 1) ) - "*Files syntax checking is allowed for." + "Files syntax checking is allowed for." :group 'flymake :type '(repeat (string symbol symbol symbol))) @@ -384,7 +383,7 @@ (defun flymake-find-possible-master-files (file-name master-file-dirs masks) "Find (by name and location) all possible master files. -Master files are .cpp and .c for and .h. Files are searched for +Master files include .cpp and .c for .h. Files are searched for starting from the .h directory and max max-level parent dirs. File contents are not checked." (let* ((dirs master-file-dirs) @@ -434,9 +433,11 @@ source-file-name patched-source-file-name include-dirs regexp) "Check if MASTER-FILE-NAME is a master file for SOURCE-FILE-NAME. -For .cpp master file this means it includes SOURCE-FILE-NAME (.h). If yes, patch a copy of MASTER-FILE-NAME to include PATCHED-SOURCE-FILE-NAME instead of SOURCE-FILE-NAME. + +For example, foo.cpp is a master file if it includes foo.h. + Whether a buffer for MATER-FILE-NAME exists, use it as a source instead of reading master file from disk." (let* ((source-file-nondir (file-name-nondirectory source-file-name)) @@ -1700,9 +1701,10 @@ ;;;; .h/make specific (defun flymake-master-make-header-init () - (flymake-master-make-init 'flymake-get-include-dirs - '("\\.cpp\\'" "\\.c\\'") - "[ \t]*#[ \t]*include[ \t]*\"\\([[:word:]0-9/\\_.]*%s\\)\"")) + (flymake-master-make-init + 'flymake-get-include-dirs + '("\\.\\(?:c\\(?:pp\\|xx\\|\\+\\+\\)?\\|CC\\)\\'") + "[ \t]*#[ \t]*include[ \t]*\"\\([[:word:]0-9/\\_.]*%s\\)\"")) ;;;; .java/make specific (defun flymake-simple-make-java-init () ------------------------------------------------------------ revno: 99404 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-01-28 12:47:05 -0500 message: * fileio.c (Frename_file): Fix last change (Bug#5487). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-28 17:33:28 +0000 +++ src/ChangeLog 2010-01-28 17:47:05 +0000 @@ -1,5 +1,7 @@ 2010-01-28 Chong Yidong + * fileio.c (Frename_file): Fix last change (Bug#5487). + * m/mips.h: Remove DATA_START. Suggested by Dan Nicolaescu. * m/alpha.h: Don't define DATA_START on NetBSD (Bug#4629). === modified file 'src/fileio.c' --- src/fileio.c 2010-01-27 04:08:41 +0000 +++ src/fileio.c 2010-01-28 17:47:05 +0000 @@ -2289,7 +2289,7 @@ NILP (ok_if_already_exists) ? Qnil : Qt); else #endif - if (Ffile_directory_p (file)) + if (!NILP (Ffile_directory_p (file))) call4 (Qcopy_directory, file, newname, Qt, Qnil); else /* We have already prompted if it was an integer, so don't @@ -2300,7 +2300,7 @@ count = SPECPDL_INDEX (); specbind (Qdelete_by_moving_to_trash, Qnil); - if (Ffile_directory_p (file)) + if (!NILP (Ffile_directory_p (file))) call2 (Qdelete_directory, file, Qt); else Fdelete_file (file); ------------------------------------------------------------ revno: 99403 committer: Chong Yidong branch nick: trunk timestamp: Thu 2010-01-28 12:33:28 -0500 message: Fixes for NetBSD (Bug#4629, Bug#2072). * m/mips.h: Remove DATA_START. Suggested by Dan Nicolaescu. * m/alpha.h: Don't define DATA_START on NetBSD (Bug#4629). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-28 13:09:25 +0000 +++ src/ChangeLog 2010-01-28 17:33:28 +0000 @@ -1,3 +1,9 @@ +2010-01-28 Chong Yidong + + * m/mips.h: Remove DATA_START. Suggested by Dan Nicolaescu. + + * m/alpha.h: Don't define DATA_START on NetBSD (Bug#4629). + 2010-01-28 Jan Djärv * xfns.c (Fx_create_frame): Remove window size matching code from === modified file 'src/m/alpha.h' --- src/m/alpha.h 2010-01-13 08:35:10 +0000 +++ src/m/alpha.h 2010-01-28 17:33:28 +0000 @@ -95,7 +95,7 @@ #undef UNEXEC #define UNEXEC unexelf.o -#ifndef GNU_LINUX +#if !defined(GNU_LINUX) && !defined(__NetBSD__) #define DATA_START 0x140000000 #endif === modified file 'src/m/mips.h' --- src/m/mips.h 2010-01-13 08:35:10 +0000 +++ src/m/mips.h 2010-01-28 17:33:28 +0000 @@ -50,10 +50,6 @@ #define TEXT_START 0x00400000 -#ifndef GNU_LINUX -#define DATA_START 0x10000000 -#endif - #if 0 /* These definitions were advantageous when not using USE_LSB_TAG. With that, they get ignored but cause errors. */ ------------------------------------------------------------ revno: 99402 committer: Alan Mackenzie branch nick: trunk timestamp: Thu 2010-01-28 16:24:50 +0000 message: display.texi (Auto Faces): Say fontification-functions is called whether or not Font Lock is enabled. Tidy up the wording a bit. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2010-01-17 22:24:49 +0000 +++ doc/lispref/ChangeLog 2010-01-28 16:24:50 +0000 @@ -1,3 +1,8 @@ +2010-01-28 Alan Mackenzie + + * display.texi (Auto Faces): Say fontification-functions is called + whether or not Font Lock is enabled. Tidy up the wording a bit. + 2010-01-17 Chong Yidong * elisp.texi: Remove duplicate edition information (Bug#5407). === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2010-01-13 08:35:10 +0000 +++ doc/lispref/display.texi 2010-01-28 16:24:50 +0000 @@ -2654,23 +2654,25 @@ @defvar fontification-functions This variable holds a list of functions that are called by Emacs -redisplay as needed to assign faces automatically to text in the buffer. +redisplay as needed, just before doing redisplay. They are called even +when Font Lock Mode isn't enabled. When Font Lock Mode is enabled, this +variable usually holds just one function, @code{jit-lock-function}. The functions are called in the order listed, with one argument, a -buffer position @var{pos}. Each function should attempt to assign faces -to the text in the current buffer starting at @var{pos}. +buffer position @var{pos}. Collectively they should attempt to assign +faces to the text in the current buffer starting at @var{pos}. -Each function should record the faces they assign by setting the -@code{face} property. It should also add a non-@code{nil} -@code{fontified} property for all the text it has assigned faces to. +The functions should record the faces they assign by setting the +@code{face} property. They should also add a non-@code{nil} +@code{fontified} property to all the text they have assigned faces to. That property tells redisplay that faces have been assigned to that text already. -It is probably a good idea for each function to do nothing if the +It is probably a good idea for the functions to do nothing if the character after @var{pos} already has a non-@code{nil} @code{fontified} property, but this is not required. If one function overrides the -assignments made by a previous one, the properties as they are -after the last function finishes are the ones that really matter. +assignments made by a previous one, the properties after the last +function finishes are the ones that really matter. For efficiency, we recommend writing these functions so that they usually assign faces to around 400 to 600 characters at each call. ------------------------------------------------------------ revno: 99401 committer: Jason Rumney branch nick: trunk timestamp: Thu 2010-01-28 21:09:25 +0800 message: Add bug number to recent change. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-28 07:10:04 +0000 +++ src/ChangeLog 2010-01-28 13:09:25 +0000 @@ -7,7 +7,7 @@ 2010-01-27 Jason Rumney * w32inevt.c (w32_kbd_patch_key): Save the unicode character. - (key_event): Use unicode for characters 128 and higher. + (key_event): Use unicode for characters 128 and higher (Bug#4567). 2010-01-27 Kenichi Handa ------------------------------------------------------------ revno: 99400 [merge] committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-01-28 09:03:33 +0000 message: Fix last bogus commit. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-01-25 04:52:26 +0000 +++ doc/misc/ChangeLog 2010-01-28 08:58:10 +0000 @@ -1,8 +1,8 @@ -2010-01-24 Mark A. Hershberger +2010-01-21 Katsumi Yamaoka * gnus.texi (Score File Format): Fix typo. -2010-01-21 Katsumi Yamaoka +2010-01-19 Mark A. Hershberger * cc-mode.texi: Replace references to obsolete c-subword-mode. ------------------------------------------------------------ revno: 99399 [merge] committer: Jan D. branch nick: trunk timestamp: Thu 2010-01-28 08:13:47 +0100 message: Revert code for bug #3643. xfns.c (Fx_create_frame): Remove window size matching code from 2010-01-15. (x_get_current_desktop, x_get_desktop_workarea): Remove diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-01-27 13:59:13 +0000 +++ src/ChangeLog 2010-01-28 07:10:04 +0000 @@ -1,3 +1,9 @@ +2010-01-28 Jan Djärv + + * xfns.c (Fx_create_frame): Remove window size matching code from + 2010-01-15. + (x_get_current_desktop, x_get_desktop_workarea): Remove + 2010-01-27 Jason Rumney * w32inevt.c (w32_kbd_patch_key): Save the unicode character. === modified file 'src/xfns.c' --- src/xfns.c 2010-01-25 07:43:10 +0000 +++ src/xfns.c 2010-01-28 07:10:04 +0000 @@ -3145,91 +3145,6 @@ return Qnil; } -/* Return current desktop index for the display where frame F is. - If we can't find out the current desktop, return 0. */ - -static int -x_get_current_desktop (f) - struct frame *f; -{ - Atom actual_type; - unsigned long actual_size, bytes_remaining; - int rc, actual_format; - struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); - long max_len = 10; - Display *dpy = FRAME_X_DISPLAY (f); - long *data = NULL; - int current_desktop; - - BLOCK_INPUT; - x_catch_errors (dpy); - rc = XGetWindowProperty (dpy, dpyinfo->root_window, - XInternAtom (dpy, "_NET_CURRENT_DESKTOP", False), - 0, max_len, False, XA_CARDINAL, - &actual_type, &actual_format, &actual_size, - &bytes_remaining, (unsigned char **)&data); - - if (rc != Success || actual_type != XA_CARDINAL || x_had_errors_p (dpy) - || actual_size == 0 || actual_format != 32) - current_desktop = 0; - else - current_desktop = (int)*data; - - if (data) XFree (data); - x_uncatch_errors (); - UNBLOCK_INPUT; - return current_desktop; -} - -/* Return current size for DESKTOP_INDEX on the display where frame F is. - If we can't find out the size, return 0, otherwise 1. */ - -static int -x_get_desktop_workarea (f, desktop_index, deskw, deskh) - struct frame *f; - int desktop_index; - int *deskw, *deskh; -{ - Atom actual_type; - unsigned long actual_size, bytes_remaining; - int rc, actual_format; - struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); - long max_len = 1000; /* This handles 250 desktops, who has that many? */ - Display *dpy = FRAME_X_DISPLAY (f); - long *data = NULL; - int retval; - - BLOCK_INPUT; - x_catch_errors (dpy); - rc = XGetWindowProperty (dpy, dpyinfo->root_window, - XInternAtom (dpy, "_NET_WORKAREA", False), - 0, max_len, False, XA_CARDINAL, - &actual_type, &actual_format, &actual_size, - &bytes_remaining, (unsigned char **)&data); - - if (rc != Success || actual_type != XA_CARDINAL || x_had_errors_p (dpy) - || actual_size < 3 || actual_format != 32) - retval = 0; - else - { - int idx; - - if (actual_size == 4 /* Only one info for all desktops. */ - || desktop_index*4 > actual_size) /* destop_index out of range. */ - desktop_index = 0; - - idx = desktop_index*4; - *deskw = data[idx+2] - data[idx]; - *deskh = data[idx+3] - data[idx+1]; - retval = 1; - } - - if (data) XFree (data); - x_uncatch_errors (); - UNBLOCK_INPUT; - return retval; -} - DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, 1, 1, 0, doc: /* Make a new X window, which is called a "frame" in Emacs terms. @@ -3249,7 +3164,7 @@ Lisp_Object name; int minibuffer_only = 0; long window_prompting = 0; - int width, height, deskw = -1, deskh = -1, current_desktop = -1; + int width, height; int count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; Lisp_Object display; @@ -3517,66 +3432,6 @@ /* Compute the size of the X window. */ window_prompting = x_figure_window_size (f, parms, 1); - /* Don't make height higher than display height unless the user asked - for it. Try sizes 24 and 10 if current is too large. */ - height = FRAME_LINES (f); - tem = x_get_arg (dpyinfo, parms, Qheight, 0, 0, RES_TYPE_NUMBER); - if (EQ (tem, Qunbound)) - { - int h = FRAME_LINES (f) + FRAME_TOOL_BAR_LINES (f) - + FRAME_MENU_BAR_LINES (f) + 2; - int ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, h); - int dph = DisplayHeight (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f)); - static int tryheight[] = { 24, 10, 0 } ; - int i; - - ph += (FRAME_EXTERNAL_TOOL_BAR (f) ? 32 : 0) /* Gtk toolbar size */ - + (FRAME_EXTERNAL_MENU_BAR (f) ? 24 : 0); /* Arbitrary */ - - /* Some desktops have fixed menus above and/or panels below. Try to - figure out the usable size we have for emacs. */ - current_desktop = x_get_current_desktop (f); - x_get_desktop_workarea (f, current_desktop, &deskw, &deskh); - if (deskh > 0 && deskh < dph) dph = deskh; - - /* Allow 40 pixels for manager decorations. */ - for (i = 0; ph+40 > dph && tryheight[i] != 0; ++i) - { - height = tryheight[i]; - h = height + FRAME_TOOL_BAR_LINES (f) + FRAME_MENU_BAR_LINES (f) + 2; - ph = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, h) - + (FRAME_EXTERNAL_TOOL_BAR (f) ? 32 : 0) - + (FRAME_EXTERNAL_MENU_BAR (f) ? 24 : 0); - } - } - - /* Don't make width wider than display width unless the user asked - for it. */ - width = FRAME_COLS (f); - tem = x_get_arg (dpyinfo, parms, Qwidth, 0, 0, RES_TYPE_NUMBER); - if (EQ (tem, Qunbound)) - { - int pw = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, FRAME_COLS (f)); - int dpw = DisplayWidth (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f)); - if (deskw == -1) - { - current_desktop = x_get_current_desktop (f); - x_get_desktop_workarea (f, current_desktop, &deskw, &deskh); - } - if (deskw > 0 && deskw < dpw) dpw = deskw; - - if (pw > dpw) - width = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, dpw); - } - - if (height != FRAME_LINES (f) || width != FRAME_COLS (f)) - { - check_frame_size (f, &height, &width); - FRAME_LINES (f) = height; - SET_FRAME_COLS (f, width); - } - - tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); f->no_split = minibuffer_only || EQ (tem, Qt); ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.