------------------------------------------------------------ revno: 115320 committer: Dmitry Gutov branch nick: trunk timestamp: Sun 2013-12-01 06:13:50 +0200 message: Apply the initial log-edit tweaks discussed at emacs-devel * .dir-locals.el: (log-edit-move): Add the "Author: " header. * lisp/vc/log-edit.el (log-edit-mode-map): Add binding for `log-edit-beginning-of-line'. (log-edit-setup-add-author): New user option. (log-edit-beginning-of-line): New command. (log-edit): Move major mode call above the contents setup so that the local variable values are already applied. (log-edit): Only insert "Author: " when `log-edit-setup-add-author' is non-nil. (log-edit): When SETUP is non-nil, position point after ": " instead of point-min. diff: === modified file '.dir-locals.el' --- .dir-locals.el 2012-09-24 14:38:10 +0000 +++ .dir-locals.el 2013-12-01 04:13:50 +0000 @@ -7,7 +7,8 @@ ;; See admin/notes/bugtracker. (log-edit-mode . ((log-edit-rewrite-fixes "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1") - (log-edit-font-lock-gnu-style . t))) + (log-edit-font-lock-gnu-style . t) + (log-edit-setup-add-author . t))) (change-log-mode . ((add-log-time-zone-rule . t) (fill-column . 74) (bug-reference-url-format . "http://debbugs.gnu.org/%s") === modified file 'ChangeLog' --- ChangeLog 2013-11-30 15:42:13 +0000 +++ ChangeLog 2013-12-01 04:13:50 +0000 @@ -1,3 +1,7 @@ +2013-12-01 Dmitry Gutov + + * .dir-locals.el: (log-edit-move): Add the "Author: " header. + 2013-11-30 Dani Moncayo * build-aux/msys-to-w32 (w32pathlist): Do not translate paths === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-12-01 02:04:46 +0000 +++ lisp/ChangeLog 2013-12-01 04:13:50 +0000 @@ -1,3 +1,16 @@ +2013-12-01 Dmitry Gutov + + * vc/log-edit.el (log-edit-mode-map): Add binding for + `log-edit-beginning-of-line'. + (log-edit-setup-add-author): New user option. + (log-edit-beginning-of-line): New command. + (log-edit): Move major mode call above the contents setup so that + the local variable values are already applied. + (log-edit): Only insert "Author: " when + `log-edit-setup-add-author' is non-nil. + (log-edit): When SETUP is non-nil, position point after ": " + instead of point-min. + 2013-12-01 Glenn Morris * startup.el (command-line): Warn if ~/emacs.d is in load-path. === modified file 'lisp/vc/log-edit.el' --- lisp/vc/log-edit.el 2013-01-12 03:15:14 +0000 +++ lisp/vc/log-edit.el 2013-12-01 04:13:50 +0000 @@ -32,6 +32,7 @@ (require 'add-log) ; for all the ChangeLog goodies (require 'pcvs-util) (require 'ring) +(require 'message) ;;;; ;;;; Global Variables @@ -55,6 +56,7 @@ ("\C-c\C-a" . log-edit-insert-changelog) ("\C-c\C-d" . log-edit-show-diff) ("\C-c\C-f" . log-edit-show-files) + ("\C-a" . log-edit-beginning-of-line) ("\M-n" . log-edit-next-comment) ("\M-p" . log-edit-previous-comment) ("\M-r" . log-edit-comment-search-backward) @@ -116,6 +118,13 @@ :group 'log-edit :type 'boolean) +(defcustom log-edit-setup-add-author nil + "Non-nil means `log-edit' should add the `Author:' header when +its SETUP argument is non-nil." + :group 'log-edit + :type 'boolean + :safe 'booleanp) + (defcustom log-edit-hook '(log-edit-insert-cvs-template log-edit-show-files log-edit-insert-changelog) @@ -427,13 +436,15 @@ (if buffer (pop-to-buffer buffer)) (when (and log-edit-setup-invert (not (eq setup 'force))) (setq setup (not setup))) - (when setup - (erase-buffer) - (insert "Summary: \nAuthor: ") - (save-excursion (insert "\n\n"))) (if mode (funcall mode) (log-edit-mode)) + (when setup + (erase-buffer) + (insert "Summary: ") + (when log-edit-setup-add-author + (insert "\nAuthor: ")) + (insert "\n\n")) (set (make-local-variable 'log-edit-callback) callback) (if (listp params) (dolist (crt params) @@ -445,7 +456,10 @@ (if buffer (set (make-local-variable 'log-edit-parent-buffer) parent)) (set (make-local-variable 'log-edit-initial-files) (log-edit-files)) (when setup (run-hooks 'log-edit-hook)) - (goto-char (point-min)) (push-mark (point-max)) + (if setup + (message-position-point) + (goto-char (point-min))) + (push-mark (point-max)) (message "%s" (substitute-command-keys "Press \\[log-edit-done] when you are done editing.")))) @@ -574,6 +588,15 @@ (shrink-window-if-larger-than-buffer) (selected-window))))) +(defun log-edit-beginning-of-line (&optional n) + "Move point to beginning of header value or to beginning of line. + +It works the same as `message-beginning-of-line', but it uses a +different header separator appropriate for `log-edit-mode'." + (interactive "p") + (let ((mail-header-separator "")) + (message-beginning-of-line n))) + (defun log-edit-empty-buffer-p () "Return non-nil if the buffer is \"empty\"." (or (= (point-min) (point-max)) ------------------------------------------------------------ revno: 115319 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-11-30 18:04:46 -0800 message: * lisp/startup.el (command-line): Warn if ~/emacs.d is in load-path. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-30 19:12:21 +0000 +++ lisp/ChangeLog 2013-12-01 02:04:46 +0000 @@ -1,3 +1,7 @@ +2013-12-01 Glenn Morris + + * startup.el (command-line): Warn if ~/emacs.d is in load-path. + 2013-11-30 Eli Zaretskii * startup.el (fancy-splash-frame): On MS-Windows, trigger === modified file 'lisp/startup.el' --- lisp/startup.el 2013-11-30 19:11:00 +0000 +++ lisp/startup.el 2013-12-01 02:04:46 +0000 @@ -1289,6 +1289,29 @@ ;; Process the remaining args. (command-line-1 (cdr command-line-args)) + ;; This is a problem because, e.g. if emacs.d/gnus.el exists, + ;; trying to load gnus could load the wrong file. + ;; OK, it would not matter if .emacs.d were at the end of load-path. + ;; but for the sake of simplicity, we discourage it full-stop. + ;; Ref eg http://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00056.html + ;; + ;; A bad element could come from user-emacs-file, the command line, + ;; or EMACSLOADPATH, so we basically always have to check. + (let (warned) + (dolist (dir load-path) + (and (not warned) + (string-match-p "/[._]emacs\\.d/?\\'" dir) + (string-equal (file-name-as-directory (expand-file-name dir)) + (expand-file-name user-emacs-directory)) + (setq warned t) + (display-warning 'initialization + (format "Your `load-path' seems to contain +your `.emacs.d' directory: %s\n\ +This is likely to cause problems...\n\ +Consider using a subdirectory instead, e.g.: %s" dir +(expand-file-name "lisp" user-emacs-directory)) + :warning)))) + ;; If -batch, terminate after processing the command options. (if noninteractive (kill-emacs t)) ------------------------------------------------------------ revno: 115318 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-11-30 17:37:23 -0800 message: * unidata/Makefile.in (${DSTDIR}/charprop.el): Ensure output files are writable. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-11-30 17:54:40 +0000 +++ admin/ChangeLog 2013-12-01 01:37:23 +0000 @@ -1,3 +1,8 @@ +2013-12-01 Glenn Morris + + * unidata/Makefile.in (${DSTDIR}/charprop.el): + Ensure output files are writable. + 2013-11-30 Glenn Morris * grammars/Makefile.in: Ensure output files are writable. === modified file 'admin/unidata/Makefile.in' --- admin/unidata/Makefile.in 2013-11-27 18:34:25 +0000 +++ admin/unidata/Makefile.in 2013-12-01 01:37:23 +0000 @@ -48,6 +48,9 @@ ## Same for UnicodeData.txt v unidata.txt. ${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt ${MAKE} ${MFLAGS} compile unidata.txt EMACS="${EMACS}" + -if [ -f "$@" ]; then \ + cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \ + fi ${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \ ${srcdir} "${DSTDIR}" ------------------------------------------------------------ revno: 115317 fixes bug: http://debbugs.gnu.org/16014 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-11-30 21:12:21 +0200 message: Commit ChangeLog for last change. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-30 09:28:17 +0000 +++ lisp/ChangeLog 2013-11-30 19:12:21 +0000 @@ -1,3 +1,9 @@ +2013-11-30 Eli Zaretskii + + * startup.el (fancy-splash-frame): On MS-Windows, trigger + redisplay to make sure the initial frame gets a change to become + visible. (Bug#16014) + 2013-11-30 Martin Rudalics Support resizing frames and windows pixelwise. ------------------------------------------------------------ revno: 115316 fixes bug: http://debbugs.gnu.org/16014 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-11-30 21:11:00 +0200 message: Fix bug #16014 with not showing fancy splash screen on MS-Windows. lisp/startup.el (fancy-splash-frame): On MS-Windows, trigger redisplay to make sure the initial frame gets a change to become visible. diff: === modified file 'lisp/startup.el' --- lisp/startup.el 2013-11-27 06:15:06 +0000 +++ lisp/startup.el 2013-11-30 19:11:00 +0000 @@ -1764,6 +1764,10 @@ use the fancy splash screen, but if we do use it, we put it on this frame." (let (chosen-frame) + ;; MS-Windows needs this to have a chance to make the initial + ;; frame visible. + (if (eq system-type 'windows-nt) + (sit-for 0 t)) (dolist (frame (append (frame-list) (list (selected-frame)))) (if (and (frame-visible-p frame) (not (window-minibuffer-p (frame-selected-window frame)))) @@ -1774,7 +1778,7 @@ "Return t if fancy splash screens should be used." (when (and (display-graphic-p) (or (and (display-color-p) - (image-type-available-p 'xpm)) + (image-type-available-p 'xpm)) (image-type-available-p 'pbm))) (let ((frame (fancy-splash-frame))) (when frame ------------------------------------------------------------ revno: 115315 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-11-30 10:44:31 -0800 message: * .bzrignore: Convert map ignore pattern back to original form. Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00464.html http://debbugs.gnu.org/16007#12 diff: === modified file '.bzrignore' --- .bzrignore 2013-11-30 18:39:51 +0000 +++ .bzrignore 2013-11-30 18:44:31 +0000 @@ -20,7 +20,7 @@ *.exe *.res *.tmp -*.map +src/temacs.map ./aclocal.m4 autom4te.cache confdefs.h ------------------------------------------------------------ revno: 115314 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-11-30 10:39:51 -0800 message: * .bzrignore: No longer ignore src/stamp-oldxmenu diff: === modified file '.bzrignore' --- .bzrignore 2013-11-30 18:31:02 +0000 +++ .bzrignore 2013-11-30 18:39:51 +0000 @@ -214,7 +214,6 @@ src/epaths.h src/gdb.ini src/prefix-args* -src/stamp-oldxmenu src/stamp-h.in src/temacs test/indent/*.new ------------------------------------------------------------ revno: 115313 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-11-30 10:34:58 -0800 message: doc/ distclean rules should remove Makefiles * emacs/Makefile.in (distclean): * lispintro/Makefile.in (distclean): * lispref/Makefile.in (distclean): * misc/Makefile.in (distclean): Remove Makefile. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-11-29 18:54:14 +0000 +++ doc/emacs/ChangeLog 2013-11-30 18:34:58 +0000 @@ -1,3 +1,7 @@ +2013-11-30 Glenn Morris + + * Makefile.in (distclean): Remove Makefile. + 2013-11-29 Stefan Monnier * buffers.texi (Icomplete): Rename from Iswitchb and === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2013-10-23 07:20:57 +0000 +++ doc/emacs/Makefile.in 2013-11-30 18:34:58 +0000 @@ -196,6 +196,7 @@ rm -f emacs-manual-${version}.tar* distclean: clean + rm -f Makefile ## In the standalone tarfile, the clean rule runs this. infoclean: === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2013-10-23 07:20:57 +0000 +++ doc/lispintro/ChangeLog 2013-11-30 18:34:58 +0000 @@ -1,3 +1,7 @@ +2013-11-30 Glenn Morris + + * Makefile.in (distclean): Remove Makefile. + 2013-10-23 Glenn Morris * Makefile.in (install-dvi, install-html, install-pdf) === modified file 'doc/lispintro/Makefile.in' --- doc/lispintro/Makefile.in 2013-10-23 07:20:57 +0000 +++ doc/lispintro/Makefile.in 2013-11-30 18:34:58 +0000 @@ -113,6 +113,7 @@ rm -f emacs-lispintro-${version}.tar* distclean: clean + rm -f Makefile infoclean: -cd $(buildinfodir) && rm -f eintr$(INFO_EXT) eintr$(INFO_EXT)-[1-9] === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-11-29 03:38:20 +0000 +++ doc/lispref/ChangeLog 2013-11-30 18:34:58 +0000 @@ -1,3 +1,7 @@ +2013-11-30 Glenn Morris + + * Makefile.in (distclean): Remove Makefile. + 2013-11-29 Andreas Politz * modes.texi (Imenu): Make it clear that sub-alist is the cdr === modified file 'doc/lispref/Makefile.in' --- doc/lispref/Makefile.in 2013-10-23 07:20:57 +0000 +++ doc/lispref/Makefile.in 2013-11-30 18:34:58 +0000 @@ -169,6 +169,7 @@ rm -f emacs-lispref-${version}.tar* distclean: clean + rm -f Makefile infoclean: -cd $(buildinfodir) && rm -f elisp$(INFO_EXT) elisp$(INFO_EXT)-[1-9] elisp$(INFO_EXT)-[1-9][0-9] === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-11-20 08:52:15 +0000 +++ doc/misc/ChangeLog 2013-11-30 18:34:58 +0000 @@ -1,3 +1,7 @@ +2013-11-30 Glenn Morris + + * Makefile.in (distclean): Remove Makefile. + 2013-11-20 era eriksson * ses.texi (Quick Tutorial): New chapter. (Bug#14748) === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2013-10-23 07:20:57 +0000 +++ doc/misc/Makefile.in 2013-11-30 18:34:58 +0000 @@ -842,7 +842,7 @@ rm -f emacs-misc-${version}.tar* distclean: clean -# rm -f Makefile + rm -f Makefile ## buildinfodir is relative to srcdir. infoclean: ------------------------------------------------------------ revno: 115312 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-11-30 10:31:02 -0800 message: * .bzrignore: Notice static test/ Makefiles. diff: === modified file '.bzrignore' --- .bzrignore 2013-11-30 18:22:37 +0000 +++ .bzrignore 2013-11-30 18:31:02 +0000 @@ -218,6 +218,8 @@ src/stamp-h.in src/temacs test/indent/*.new +!test/automated/flymake/warnpred/Makefile +!test/indent/Makefile +* src/globals.h src/gl-stamp ------------------------------------------------------------ revno: 115311 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-11-30 10:22:37 -0800 message: bzrignore tweaks * .bzrignore: Notice admin/charsets/Makefile. Should be no more Makefile.c. diff: === modified file '.bzrignore' --- .bzrignore 2013-11-30 02:06:34 +0000 +++ .bzrignore 2013-11-30 18:22:37 +0000 @@ -37,13 +37,13 @@ ID makefile Makefile -Makefile.c ./GNUmakefile.unix stamp-h1 stamp_BLD subdirs.el TAGS cxxdefs.h +!admin/charsets/Makefile # Intermediate files when making pdf versions of the manuals. doc/**/*.aux doc/**/*.cm ------------------------------------------------------------ revno: 115310 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-11-30 09:54:40 -0800 message: * admin/grammars/Makefile.in: Ensure output files are writable. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-11-30 10:42:17 +0000 +++ admin/ChangeLog 2013-11-30 17:54:40 +0000 @@ -1,3 +1,7 @@ +2013-11-30 Glenn Morris + + * grammars/Makefile.in: Ensure output files are writable. + 2013-11-30 Eli Zaretskii * charsets/mule-charsets.el: Rewritten to work in Emacs 23 and === modified file 'admin/grammars/Makefile.in' --- admin/grammars/Makefile.in 2013-11-30 02:06:34 +0000 +++ admin/grammars/Makefile.in 2013-11-30 17:54:40 +0000 @@ -65,28 +65,36 @@ ${bovinedir}/c-by.el: ${srcdir}/c.by + [ ! -f "$@" ] || chmod +w "$@" ${make_bovine} -o "$@" ${srcdir}/c.by ${bovinedir}/make-by.el: ${srcdir}/make.by + [ ! -f "$@" ] || chmod +w "$@" ${make_bovine} -o "$@" ${srcdir}/make.by ${bovinedir}/scm-by.el: ${srcdir}/scheme.by + [ ! -f "$@" ] || chmod +w "$@" ${make_bovine} -o "$@" ${srcdir}/scheme.by ${cedetdir}/semantic/grammar-wy.el: ${srcdir}/grammar.wy + [ ! -f "$@" ] || chmod +w "$@" ${make_wisent} -o "$@" ${srcdir}/grammar.wy ${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy + [ ! -f "$@" ] || chmod +w "$@" ${make_wisent} -o "$@" ${srcdir}/java-tags.wy ${wisentdir}/js-wy.el: ${srcdir}/js.wy + [ ! -f "$@" ] || chmod +w "$@" ${make_wisent} -o "$@" ${srcdir}/js.wy ${wisentdir}/python-wy.el: ${srcdir}/python.wy + [ ! -f "$@" ] || chmod +w "$@" ${make_wisent} -o "$@" ${srcdir}/python.wy ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy + [ ! -f "$@" ] || chmod +w "$@" ${make_wisent} -o "$@" ${srcdir}/srecode-template.wy ------------------------------------------------------------ revno: 115309 committer: martin rudalics branch nick: trunk timestamp: Sat 2013-11-30 17:25:51 +0100 message: Remove some unused items introduced during pixelwise change. * window.c (window_resize_total_check): Remove unused function. * xdisp.c (remember_mouse_glyph): Remove unused label. (Ftool_bar_height): Move declaration inside #if. * xterm.c (x_set_window_size): Don't use r and c. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-30 15:51:16 +0000 +++ src/ChangeLog 2013-11-30 16:25:51 +0000 @@ -1,3 +1,11 @@ +2013-11-30 Martin Rudalics + + Remove some unused items introduced during pixelwise change. + * window.c (window_resize_total_check): Remove unused function. + * xdisp.c (remember_mouse_glyph): Remove unused label. + (Ftool_bar_height): Move declaration inside #if. + * xterm.c (x_set_window_size): Don't use r and c. + 2013-11-30 Juanma Barranquero * xdisp.c (Fwindow_text_pixel_size): Remove unused variables === modified file 'src/window.c' --- src/window.c 2013-11-30 15:51:16 +0000 +++ src/window.c 2013-11-30 16:25:51 +0000 @@ -3784,102 +3784,6 @@ : FRAME_LINE_HEIGHT (f))); } -static int -window_resize_total_check (struct window *w, int horflag) -{ - struct frame *f = XFRAME (w->frame); - struct window *c; - - if (WINDOW_VERTICAL_COMBINATION_P (w)) - /* W is a vertical combination. */ - { - c = XWINDOW (w->contents); - if (horflag) - /* All child windows of W must have the same width as W. */ - { - while (c) - { - if (XINT (c->new_pixel) != XINT (w->new_pixel) -/** || XINT (c->new_total != XINT (w->new_total)) **/ - || !window_resize_check (c, horflag)) - return 0; - - c = NILP (c->next) ? 0 : XWINDOW (c->next); - } - - return 1; - } - else - /* The sum of the heights of the child windows of W must equal - W's height. */ - { - int sum_of_pixels = 0, sum_of_totals = 0; - - while (c) - { - if (!window_resize_check (c, horflag)) - return 0; - - sum_of_pixels = sum_of_pixels + XINT (c->new_pixel); -/** sum_of_totals = sum_of_totals + XINT (c->new_total); **/ - c = NILP (c->next) ? 0 : XWINDOW (c->next); - } - - return (sum_of_pixels == XINT (w->new_pixel) -/** && sum_of_totals == XINT (w->new_total) **/ - ); - } - } - else if (WINDOW_HORIZONTAL_COMBINATION_P (w)) - /* W is a horizontal combination. */ - { - c = XWINDOW (w->contents); - if (horflag) - /* The sum of the widths of the child windows of W must equal W's - width. */ - { - int sum_of_pixels = 0, sum_of_totals = 0; - - while (c) - { - if (!window_resize_check (c, horflag)) - return 0; - - sum_of_pixels = sum_of_pixels + XINT (c->new_pixel); - sum_of_totals = sum_of_totals + XINT (c->new_total); - c = NILP (c->next) ? 0 : XWINDOW (c->next); - } - - return (sum_of_pixels == XINT (w->new_pixel) -/** && sum_of_totals == XINT (w->new_total) **/ - ); - } - else - /* All child windows of W must have the same height as W. */ - { - while (c) - { - if (XINT (c->new_pixel) != XINT (w->new_pixel) -/** || XINT (c->new_total) != XINT (w->new_total) **/ - || !window_resize_check (c, horflag)) - return 0; - - c = NILP (c->next) ? 0 : XWINDOW (c->next); - } - - return 1; - } - } - else - /* A leaf window. Make sure it's not too small. The following - hardcodes the values of `window-safe-min-width' (2) and - `window-safe-min-height' (1) which are defined in window.el. */ - return (XINT (w->new_pixel) >= (horflag - ? (2 * FRAME_COLUMN_WIDTH (f)) - : FRAME_LINE_HEIGHT (f)) -/** && XINT (w->new_total) >= (horflag ? 2 : 1) **/ - ); -} /* Set w->pixel_height (w->pixel_height if HORIZONTAL is non-zero) to w->new_pixel for window W and recursively all child windows of W. === modified file 'src/xdisp.c' --- src/xdisp.c 2013-11-30 15:51:16 +0000 +++ src/xdisp.c 2013-11-30 16:25:51 +0000 @@ -2484,7 +2484,6 @@ goto store_rect; } - pixelwise: gx += WINDOW_LEFT_EDGE_X (w); gy += WINDOW_TOP_EDGE_Y (w); @@ -12108,10 +12107,11 @@ PIXELWISE non-nil means return the height of the tool bar inpixels. */) (Lisp_Object frame, Lisp_Object pixelwise) { + int height = 0; + +#if ! defined (USE_GTK) && ! defined (HAVE_NS) struct frame *f = decode_any_frame (frame); - int height = 0; -#if ! defined (USE_GTK) && ! defined (HAVE_NS) if (WINDOWP (f->tool_bar_window) && WINDOW_PIXEL_HEIGHT (XWINDOW (f->tool_bar_window)) > 0) { === modified file 'src/xterm.c' --- src/xterm.c 2013-11-30 09:25:31 +0000 +++ src/xterm.c 2013-11-30 16:25:51 +0000 @@ -8747,7 +8747,7 @@ if (NILP (tip_frame) || XFRAME (tip_frame) != f) { - int r, c, text_width, text_height; + int text_width, text_height; /* When the frame is maximized/fullscreen or running under for example Xmonad, x_set_window_size_1 will be a no-op. @@ -8764,12 +8764,10 @@ #endif text_width = FRAME_PIXEL_TO_TEXT_WIDTH (f, FRAME_PIXEL_WIDTH (f)); text_height = FRAME_PIXEL_TO_TEXT_HEIGHT (f, pixelh); - r = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixelh); /* Update f->scroll_bar_actual_width because it is used in FRAME_PIXEL_WIDTH_TO_TEXT_COLS. */ f->scroll_bar_actual_width = FRAME_SCROLL_BAR_COLS (f) * FRAME_COLUMN_WIDTH (f); - c = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, FRAME_PIXEL_WIDTH (f)); change_frame_size (f, text_width, text_height, 0, 1, 0, 1); } ------------------------------------------------------------ revno: 115308 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2013-11-30 16:51:16 +0100 message: src/w32term.c,window.c,xdisp.c: Remove unused variables. * w32term.c (w32_read_socket): Remove unused variable `buf'. * window.c (Fset_window_configuration): Comment out unused variables. * xdisp.c (Fwindow_text_pixel_size): Remove unused variables `value' and `endp'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-30 14:03:53 +0000 +++ src/ChangeLog 2013-11-30 15:51:16 +0000 @@ -1,3 +1,12 @@ +2013-11-30 Juanma Barranquero + + * xdisp.c (Fwindow_text_pixel_size): Remove unused variables + `value' and `endp'. + + * window.c (Fset_window_configuration): Comment out unused variables. + + * w32term.c (w32_read_socket): Remove unused variable `buf'. + 2013-11-30 Jan Djärv * xdisp.c (redisplay_internal): unrequest_sigio => request_sigio. === modified file 'src/w32term.c' --- src/w32term.c 2013-11-30 09:25:31 +0000 +++ src/w32term.c 2013-11-30 15:51:16 +0000 @@ -4224,7 +4224,6 @@ struct frame *f; struct w32_display_info *dpyinfo = &one_w32_display_info; Mouse_HLInfo *hlinfo = &dpyinfo->mouse_highlight; - static char buf[1]; block_input (); === modified file 'src/window.c' --- src/window.c 2013-11-30 09:25:31 +0000 +++ src/window.c 2013-11-30 15:51:16 +0000 @@ -4129,7 +4129,7 @@ ? FRAME_COLUMN_WIDTH (f) : FRAME_LINE_HEIGHT (f)); } - else + else { new_size= (horflag ? size @@ -4657,7 +4657,7 @@ } else { - line_height = -XINT (height); + line_height = -XINT (height); pixel_height = line_height * FRAME_LINE_HEIGHT (f); } @@ -4687,7 +4687,7 @@ eassert (MINI_WINDOW_P (w)); - height = pixelwise ? w->pixel_height : w->total_lines; + height = pixelwise ? w->pixel_height : w->total_lines; unit = pixelwise ? FRAME_LINE_HEIGHT (f) : 1; if (height > unit) { @@ -6078,10 +6078,10 @@ back. We keep track of the prevailing height in these variables. */ int previous_frame_text_height = FRAME_TEXT_HEIGHT (f); int previous_frame_text_width = FRAME_TEXT_WIDTH (f); - int previous_frame_menu_bar_height = FRAME_MENU_BAR_HEIGHT (f); - int previous_frame_tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f); - int previous_frame_lines = FRAME_LINES (f); - int previous_frame_cols = FRAME_COLS (f); + /* int previous_frame_menu_bar_height = FRAME_MENU_BAR_HEIGHT (f); */ + /* int previous_frame_tool_bar_height = FRAME_TOOL_BAR_HEIGHT (f); */ + /* int previous_frame_lines = FRAME_LINES (f); */ + /* int previous_frame_cols = FRAME_COLS (f); */ int previous_frame_menu_bar_lines = FRAME_MENU_BAR_LINES (f); int previous_frame_tool_bar_lines = FRAME_TOOL_BAR_LINES (f); @@ -6353,7 +6353,7 @@ /* This `select_window' calls record_buffer which calls Fdelq which invokes QUIT, so we do it here at the end rather than earlier, to minimize the risk of interrupting the Fset_window_configuration - in an inconsistent state (e.g. before frame-focus redirection is + in an inconsistent state (e.g. before frame-focus redirection is canceled). */ select_window (data->current_window, Qnil, 1); BVAR (XBUFFER (XWINDOW (selected_window)->contents), === modified file 'src/xdisp.c' --- src/xdisp.c 2013-11-30 14:03:53 +0000 +++ src/xdisp.c 2013-11-30 15:51:16 +0000 @@ -9512,12 +9512,12 @@ Lisp_Object mode_and_header_line) { struct window *w = decode_live_window (window); - Lisp_Object buf, value; + Lisp_Object buf; struct buffer *b; struct it it; struct buffer *old_buffer = NULL; ptrdiff_t start, end, pos; - struct text_pos startp, endp; + struct text_pos startp; void *itdata = NULL; int c, max_y = -1, x = 0, y = 0; ------------------------------------------------------------ revno: 115307 author: Dani Moncayo committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2013-11-30 16:42:13 +0100 message: msys-to-w32: Do not translate paths starting with %emacs_dir%. * build-aux/msys-to-w32 (w32pathlist): Do not translate paths starting with %emacs_dir%. diff: === modified file 'ChangeLog' --- ChangeLog 2013-11-30 02:06:34 +0000 +++ ChangeLog 2013-11-30 15:42:13 +0000 @@ -1,3 +1,8 @@ +2013-11-30 Dani Moncayo + + * build-aux/msys-to-w32 (w32pathlist): Do not translate paths + starting with %emacs_dir%. + 2013-11-30 Glenn Morris Stop keeping (most) generated cedet grammar files in the repository. === modified file 'build-aux/msys-to-w32' --- build-aux/msys-to-w32 2013-11-26 20:22:17 +0000 +++ build-aux/msys-to-w32 2013-11-30 15:42:13 +0000 @@ -36,7 +36,8 @@ 3. Replace two consecutive slashes with single ones. 4. Translate to Windows-native format those paths that are not in such format already. The translated paths will not end with a slash, - except for root directories (e.g. 'c:/' or 'c:/foo'). + except for root directories (e.g. 'c:/' or 'c:/foo'). Paths + starting with '%emacs_dir%' will not be translated. 5. Escape with backslashes every occurrence of SEPARATOR2 within the paths. 6. Concatenate the translated paths with SEPARATOR2. @@ -100,7 +101,11 @@ p="${p//\\//}" p="${p//\/\///}" - if test -d "$p" + if test "${p:0:11}" = "%emacs_dir%" + then + # Paths starting with "%emacs_dir%" will not be translated + w32p=$p + elif test -d "$p" then # The path exists, so just translate it w32p=`cd "$p" && pwd -W` @@ -162,4 +167,4 @@ done # Write the translated pathlist to the standard output -printf "${w32pathlist}" +printf "%s" "${w32pathlist}" ------------------------------------------------------------ revno: 115306 committer: Jan D. branch nick: trunk timestamp: Sat 2013-11-30 15:03:53 +0100 message: * xdisp.c (redisplay_internal): unrequest_sigio => request_sigio. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-30 13:31:39 +0000 +++ src/ChangeLog 2013-11-30 14:03:53 +0000 @@ -1,5 +1,7 @@ 2013-11-30 Jan Djärv + * xdisp.c (redisplay_internal): unrequest_sigio => request_sigio. + * xfaces.c (NEAR_SAME_COLOR_THRESHOLD): Move inside HAVE_WINDOW_SYSTEM. * gnutls.c (gnutls_audit_log_function): Only declare and define if === modified file 'src/xdisp.c' --- src/xdisp.c 2013-11-30 12:37:16 +0000 +++ src/xdisp.c 2013-11-30 14:03:53 +0000 @@ -13820,7 +13820,7 @@ end_of_redisplay: if (interrupt_input && interrupts_deferred) - unrequest_sigio (); + request_sigio (); unbind_to (count, Qnil); RESUME_POLLING; ------------------------------------------------------------ revno: 115305 fixes bug: http://debbugs.gnu.org/16001 committer: Jan D. branch nick: trunk timestamp: Sat 2013-11-30 14:31:39 +0100 message: * gnutls.c (gnutls_audit_log_function): Only declare and define if HAVE_GNUTLS3. * xfaces.c (NEAR_SAME_COLOR_THRESHOLD): Move inside HAVE_WINDOW_SYSTEM. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-30 12:37:16 +0000 +++ src/ChangeLog 2013-11-30 13:31:39 +0000 @@ -1,5 +1,10 @@ 2013-11-30 Jan Djärv + * xfaces.c (NEAR_SAME_COLOR_THRESHOLD): Move inside HAVE_WINDOW_SYSTEM. + + * gnutls.c (gnutls_audit_log_function): Only declare and define if + HAVE_GNUTLS3 (Bug#16001). + * xdisp.c (redisplay_internal): Call request_sigio at end_of_redisplay if interrupts are deferred (Bug#15801). === modified file 'src/gnutls.c' --- src/gnutls.c 2013-11-05 05:32:19 +0000 +++ src/gnutls.c 2013-11-30 13:31:39 +0000 @@ -55,8 +55,10 @@ static Lisp_Object QCgnutls_bootprop_callbacks_verify; static void gnutls_log_function (int, const char *); +static void gnutls_log_function2 (int, const char*, const char*); +#ifdef HAVE_GNUTLS3 static void gnutls_audit_log_function (gnutls_session_t, const char *); -static void gnutls_log_function2 (int, const char*, const char*); +#endif #ifdef WINDOWSNT @@ -261,6 +263,7 @@ #endif /* !WINDOWSNT */ +#ifdef HAVE_GNUTLS3 /* Function to log a simple audit message. */ static void gnutls_audit_log_function (gnutls_session_t session, const char* string) @@ -270,6 +273,7 @@ message ("gnutls.c: [audit] %s", string); } } +#endif /* Function to log a simple message. */ static void === modified file 'src/xfaces.c' --- src/xfaces.c 2013-11-30 09:25:31 +0000 +++ src/xfaces.c 2013-11-30 13:31:39 +0000 @@ -912,8 +912,6 @@ X Colors ***********************************************************************/ -#define NEAR_SAME_COLOR_THRESHOLD 30000 - /* Parse RGB_LIST, and fill in the RGB fields of COLOR. RGB_LIST should contain (at least) 3 lisp integers. Return 0 if there's a problem with RGB_LIST, otherwise return 1. */ @@ -1265,6 +1263,8 @@ #ifdef HAVE_WINDOW_SYSTEM +#define NEAR_SAME_COLOR_THRESHOLD 30000 + /* Load colors for face FACE which is used on frame F. Colors are specified by slots LFACE_BACKGROUND_INDEX and LFACE_FOREGROUND_INDEX of ATTRS. If the background color specified is not supported on F, ------------------------------------------------------------ revno: 115304 fixes bug: http://debbugs.gnu.org/15801 committer: Jan D. branch nick: trunk timestamp: Sat 2013-11-30 13:37:16 +0100 message: * xdisp.c (redisplay_internal): Call request_sigio at end_of_redisplay if interrupts are deferred. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-30 09:28:17 +0000 +++ src/ChangeLog 2013-11-30 12:37:16 +0000 @@ -1,3 +1,8 @@ +2013-11-30 Jan Djärv + + * xdisp.c (redisplay_internal): Call request_sigio at end_of_redisplay + if interrupts are deferred (Bug#15801). + 2013-11-30 Martin Rudalics Support resizing frames and windows pixelwise. === modified file 'src/xdisp.c' --- src/xdisp.c 2013-11-30 09:25:31 +0000 +++ src/xdisp.c 2013-11-30 12:37:16 +0000 @@ -13819,6 +13819,9 @@ #endif /* HAVE_WINDOW_SYSTEM */ end_of_redisplay: + if (interrupt_input && interrupts_deferred) + unrequest_sigio (); + unbind_to (count, Qnil); RESUME_POLLING; } ------------------------------------------------------------ revno: 115303 fixes bug: http://debbugs.gnu.org/16007 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-11-30 12:42:17 +0200 message: (Mostly) fix bug #16007 with generation of MULE-*.map files. admin/charsets/mule-charsets.el: Rewritten to work in Emacs 23 and later. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2013-11-30 02:06:34 +0000 +++ admin/ChangeLog 2013-11-30 10:42:17 +0000 @@ -1,3 +1,8 @@ +2013-11-30 Eli Zaretskii + + * charsets/mule-charsets.el: Rewritten to work in Emacs 23 and + later. (Bug#16007) + 2013-11-30 Glenn Morris Stop keeping (most) generated cedet grammar files in the repository. === modified file 'admin/charsets/mule-charsets.el' --- admin/charsets/mule-charsets.el 2012-08-28 16:08:50 +0000 +++ admin/charsets/mule-charsets.el 2013-11-30 10:42:17 +0000 @@ -19,20 +19,32 @@ ;; along with GNU Emacs. If not, see . -(if (not (or (and (= emacs-major-version 21) (= emacs-minor-version 4)) - (= emacs-major-version 22))) - (error "Use Emacs of version 21.4 or any of version 22")) +;; For the record: the old, pre-v23 code was this: +;; (if (not (or (and (= emacs-major-version 21) (= emacs-minor-version 4)) +;; (= emacs-major-version 22))) +;; (error "Use Emacs of version 21.4 or any of version 22")) +;; +;; (defun func (start end) +;; (while (<= start end) +;; (let ((split (split-char start)) +;; (unicode (encode-char start 'ucs))) +;; (if unicode +;; (if (nth 2 split) +;; (insert (format "0x%02X%02X 0x%04X\n" +;; (nth 1 split) (nth 2 split) unicode)) +;; (insert (format "0x%02X 0x%04X\n" (nth 1 split) unicode))))) +;; (setq start (1+ start)))) -(defun func (start end) - (while (<= start end) - (let ((split (split-char start)) - (unicode (encode-char start 'ucs))) - (if unicode - (if (nth 2 split) - (insert (format "0x%02X%02X 0x%04X\n" - (nth 1 split) (nth 2 split) unicode)) - (insert (format "0x%02X 0x%04X\n" (nth 1 split) unicode))))) - (setq start (1+ start)))) +(defun func (range charset) + (let ((start (car range)) + (end (cdr range))) + (while (and (<= start end) (<= start #x10ffff)) + (let ((ch (encode-char start charset))) + (if ch + (if (> ch 256) + (insert (format "0x%04X 0x%04X\n" ch start)) + (insert (format "0x%02X 0x%04X\n" ch start))))) + (setq start (1+ start))))) (defconst charset-alist '(("MULE-ethiopic.map" . ethiopic) @@ -51,6 +63,8 @@ (dolist (elt charset-alist) (with-temp-buffer (insert header) - (map-charset-chars 'func (cdr elt)) - (write-file (car elt)))) + (map-charset-chars 'func (cdr elt) (cdr elt)) + (sort-lines nil (point-min) (point-max)) + (let ((coding-system-for-write 'unix)) + (write-file (car elt))))) ------------------------------------------------------------ revno: 115302 committer: martin rudalics branch nick: trunk timestamp: Sat 2013-11-30 10:28:17 +0100 message: Fix ChangeLog dates of last commit. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-11-30 09:25:31 +0000 +++ lisp/ChangeLog 2013-11-30 09:28:17 +0000 @@ -1,4 +1,4 @@ -2013-12-01 Martin Rudalics +2013-11-30 Martin Rudalics Support resizing frames and windows pixelwise. * cus-start.el (frame-resize-pixelwise) === modified file 'src/ChangeLog' --- src/ChangeLog 2013-11-30 09:25:31 +0000 +++ src/ChangeLog 2013-11-30 09:28:17 +0000 @@ -1,4 +1,4 @@ -2013-12-01 Martin Rudalics +2013-11-30 Martin Rudalics Support resizing frames and windows pixelwise. * dispextern.h (enum window_part): Add ON_SCROLL_BAR,