------------------------------------------------------------ revno: 117722 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2014-08-21 23:02:23 +0000 message: lisp/gnus/mm-view.el (mm-display-inline-fontify): Make the working buffer temporarily displayed when running a mode function (at least org-mode requires it) diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2014-08-14 11:31:23 +0000 +++ lisp/gnus/ChangeLog 2014-08-21 23:02:23 +0000 @@ -1,3 +1,9 @@ +2014-08-21 Katsumi Yamaoka + + * mm-view.el (mm-display-inline-fontify): Make the working buffer + temporarily displayed when running a mode function (at least org-mode + requires it). + 2014-08-14 Alan Schmitt * gnus-sum.el (gnus-summary-expire-articles): Functions registered to === modified file 'lisp/gnus/mm-view.el' --- lisp/gnus/mm-view.el 2014-06-05 04:31:36 +0000 +++ lisp/gnus/mm-view.el 2014-08-21 23:02:23 +0000 @@ -513,7 +513,9 @@ (set (make-local-variable 'enable-local-variables) nil) (with-demoted-errors (if mode - (funcall mode) + (save-window-excursion + (switch-to-buffer (current-buffer)) + (funcall mode)) (let ((auto-mode-alist (delq (rassq 'doc-view-mode-maybe auto-mode-alist) (copy-sequence auto-mode-alist)))) ------------------------------------------------------------ revno: 117721 committer: Ken Brown branch nick: trunk timestamp: Thu 2014-08-21 17:52:26 -0400 message: * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the Cygwin-w32 build. (Bug#18302) diff: === modified file 'ChangeLog' --- ChangeLog 2014-08-11 00:59:34 +0000 +++ ChangeLog 2014-08-21 21:52:26 +0000 @@ -1,3 +1,8 @@ +2014-08-21 Ken Brown + + * configure.ac (HAVE_XPM): Explain the use of CPPFLAGS in the + Cygwin-w32 build. (Bug#18302) + 2014-08-11 Paul Eggert Don't prevent random file systems from being unmounted (Bug#18232). === modified file 'configure.ac' --- configure.ac 2014-08-15 04:34:06 +0000 +++ configure.ac 2014-08-21 21:52:26 +0000 @@ -2991,6 +2991,9 @@ ### Use -lXpm if available, unless `--with-xpm=no'. ### mingw32 doesn't use -lXpm, since it loads the library dynamically. +### In the Cygwin-w32 build, we need to use /usr/include/noX/X11/xpm.h +### rather than /usr/include/X11/xpm.h, so we set CPPFLAGS (and +### LDFLAGS) accordingly. HAVE_XPM=no LIBXPM= if test "${HAVE_W32}" = "yes" && test "${opsys}" = "cygwin"; then ------------------------------------------------------------ revno: 117720 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2014-08-21 18:07:13 +0300 message: Fix a bug in texinfo-make-menu. lisp/textmodes/texnfo-upd.el (texinfo-specific-section-type): Don't recognize a Top node if there are other sectioning commands earlier in the Texinfo file. This fixes a bug in texinfo-make-menu and avoids inflooping in texinfo-all-menus-update when they are invoked on texinfo.texi. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-21 08:40:29 +0000 +++ lisp/ChangeLog 2014-08-21 15:07:13 +0000 @@ -1,3 +1,11 @@ +2014-08-21 Eli Zaretskii + + * textmodes/texnfo-upd.el (texinfo-specific-section-type): Don't + recognize a Top node if there are other sectioning commands + earlier in the Texinfo file. This fixes a bug in + texinfo-make-menu and avoids inflooping in + texinfo-all-menus-update when they are invoked on texinfo.texi. + 2014-08-21 Martin Rudalics * window.el (window--side-window-p): New function. === modified file 'lisp/textmodes/texnfo-upd.el' --- lisp/textmodes/texnfo-upd.el 2014-01-01 07:43:34 +0000 +++ lisp/textmodes/texnfo-upd.el 2014-08-21 15:07:13 +0000 @@ -1145,24 +1145,40 @@ Searches forward for a section. Hence, point must be before the section whose type will be found. Does not move point. Signal an error if the node is not the top node and a section is not found." - (let ((case-fold-search t)) - (save-excursion - (cond - ((re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" - ;; Following search limit by cph but causes a bug - ;;(line-end-position) - nil - t) - "top") - ((re-search-forward texinfo-section-types-regexp nil t) - (buffer-substring-no-properties - (progn (beginning-of-line) ; copy its name - (1+ (point))) - (progn (forward-word 1) - (point)))) - (t - (error - "texinfo-specific-section-type: Chapter or section not found")))))) + (let* ((case-fold-search t) + ;; The Texinfo manual has a second Top node inside @verbatim + ;; near the end, which dupes us into thinking we are at top + ;; level, no matter where we are when invoked. We don't + ;; really grok @verbatim, so we cheat: only consider us to be + ;; at top level if the position of the Top node we found is + ;; before any other sectioning command. + (top-pos (save-excursion + (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)" + ;; Following search limit causes a bug + ;;(line-end-position) + nil + t))) + (sec-pos (save-excursion + (re-search-forward texinfo-section-types-regexp nil t))) + sec-name) + (if sec-pos + (save-excursion + (goto-char sec-pos) + (setq sec-name (buffer-substring-no-properties + (progn (beginning-of-line) ; copy its name + (1+ (point))) + (progn (forward-word 1) + (point)))))) + (cond + ((or sec-pos top-pos) + (if (and top-pos sec-pos) + (if (< top-pos sec-pos) + "top" + sec-name) + (or sec-name "top"))) + (t + (error + "texinfo-specific-section-type: Chapter or section not found"))))) (defun texinfo-hierarchic-level () "Return the general hierarchical level of the next node in a texinfo file. ------------------------------------------------------------ revno: 117719 committer: martin rudalics branch nick: trunk timestamp: Thu 2014-08-21 10:40:29 +0200 message: Handle failed attempts to split a side window (Bug#18304). * window.el (window--side-window-p): New function. (split-window, window-splittable-p): Use window--side-window-p to determine whether WINDOW can be split (Bug#18304). * calendar/calendar.el (calendar-basic-setup): Fix one call of `window-splittable-p' and add another (Bug#18304). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-20 20:07:00 +0000 +++ lisp/ChangeLog 2014-08-21 08:40:29 +0000 @@ -1,3 +1,11 @@ +2014-08-21 Martin Rudalics + + * window.el (window--side-window-p): New function. + (split-window, window-splittable-p): Use window--side-window-p to + determine whether WINDOW can be split (Bug#18304). + * calendar/calendar.el (calendar-basic-setup): Fix one call of + `window-splittable-p' and add another (Bug#18304). + 2014-08-20 Sam Steingold * progmodes/python.el (python-new-pythonpath): Extract from === modified file 'lisp/calendar/calendar.el' --- lisp/calendar/calendar.el 2014-06-13 19:37:52 +0000 +++ lisp/calendar/calendar.el 2014-08-21 08:40:29 +0000 @@ -1423,10 +1423,16 @@ ;; the right thing in that case. ;; ;; Is this a wide frame? If so, split it horizontally. - (if (window-splittable-p t) (split-window-right)) + + ;; The following doesn't sound useful: If we split horizontally + ;; here, the subsequent `pop-to-buffer' will likely split again + ;; horizontally and we end up with three side-by-side windows. + (when (window-splittable-p (selected-window) t) + (split-window-right)) (pop-to-buffer calendar-buffer) ;; Has the window already been split vertically? (when (and (not (window-dedicated-p)) + (window-splittable-p (selected-window)) (window-full-height-p)) (let ((win (split-window-below))) ;; In the upper window, show whatever was visible before. === modified file 'lisp/window.el' --- lisp/window.el 2014-08-11 00:59:34 +0000 +++ lisp/window.el 2014-08-21 08:40:29 +0000 @@ -743,6 +743,15 @@ (integer :tag "Number" :value 3 :size 5))) :group 'windows) +(defun window--side-window-p (window) + "Return non-nil if WINDOW is a side window or the parent of one." + (or (window-parameter window 'window-side) + (and (window-child window) + (or (window-parameter + (window-child window) 'window-side) + (window-parameter + (window-last-child window) 'window-side))))) + (defun window--major-non-side-window (&optional frame) "Return the major non-side window of frame FRAME. The optional argument FRAME must be a live frame and defaults to @@ -4378,12 +4387,7 @@ ;; side window, throw an error unless `window-combination-resize' ;; equals 'side. ((and (not (eq window-combination-resize 'side)) - (or (window-parameter window 'window-side) - (and (window-child window) - (or (window-parameter - (window-child window) 'window-side) - (window-parameter - (window-last-child window) 'window-side))))) + (window--side-window-p window)) (error "Cannot split side window or parent of side window")) ;; If `window-combination-resize' is 'side and window has a side ;; window sibling, bind `window-combination-limit' to t. @@ -5798,7 +5802,7 @@ wide as `split-width-threshold'. - When WINDOW is split evenly, the emanating windows are at least `window-min-width' or two (whichever is larger) columns wide." - (when (window-live-p window) + (when (and (window-live-p window) (not (window--side-window-p window))) (with-current-buffer (window-buffer window) (if horizontal ;; A window can be split horizontally when its width is not ------------------------------------------------------------ revno: 117718 committer: Glenn Morris branch nick: trunk timestamp: Wed 2014-08-20 16:07:00 -0400 message: ChangeLog fix Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01038.html diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-08-20 15:33:10 +0000 +++ lisp/ChangeLog 2014-08-20 20:07:00 +0000 @@ -75,14 +75,15 @@ 2014-08-13 Eric S. Raymond + * vc/vc.git.el (vc-git-resolve-when-done): New function. + Call "git add" when there are no longer conflict markers. + +2014-08-13 Rüdiger Sonderfeld + * vc/vc.git.el (vc-git-find-file-hook): New function. - Adds support for calling smerge on a conflicted file, and calling - "git add" when there are no longer conflict markers in a saved file. - This is a completed version of Rüdiger Sonderfeld's proposal. + Adds support for calling smerge (and resolve) on a conflicted file. (vc-git-conflicted-files): New function. - Integrate Rüdiger Sonderfeld's code for detecting conflicted files - using a status listing. Useful in itself and a step towards better - smerge support. + Useful in itself and a step towards better smerge support. 2014-08-12 Stefan Monnier