Now on revision 113582. ------------------------------------------------------------ revno: 113582 committer: Xue Fuqiao branch nick: trunk timestamp: Mon 2013-07-29 09:32:01 +0800 message: * INSTALL: Fix description. diff: === modified file 'ChangeLog' --- ChangeLog 2013-07-27 01:18:21 +0000 +++ ChangeLog 2013-07-29 01:32:01 +0000 @@ -1,3 +1,7 @@ +2013-07-29 Xue Fuqiao + + * INSTALL: Fix description. + 2013-07-27 Glenn Morris * configure.ac: Extend the --with-sound option to allow === modified file 'INSTALL' --- INSTALL 2013-07-20 19:20:33 +0000 +++ INSTALL 2013-07-29 01:32:01 +0000 @@ -98,7 +98,6 @@ first clean the source directories: make distclean - ./configure Note that the install automatically saves space by compressing (provided you have the `gzip' program) those installed Lisp source (.el) ------------------------------------------------------------ revno: 113581 committer: Stephen Berman branch nick: trunk timestamp: Mon 2013-07-29 01:19:25 +0200 message: Clarify ChangeLog entry. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-28 22:43:01 +0000 +++ lisp/ChangeLog 2013-07-28 23:19:25 +0000 @@ -9,7 +9,7 @@ * calendar/todo-mode.el (todo-rename-file): Fix incorrect use of replace-regexp-in-string and inadvertent omissions in previous change. (todo-filter-items): Ensure only file names are comma-separated in - renamed filtered items buffer. + name of filtered items buffer. 2013-07-28 Juanma Barranquero ------------------------------------------------------------ revno: 113580 committer: Xue Fuqiao branch nick: trunk timestamp: Mon 2013-07-29 06:48:15 +0800 message: * doc/emacs/glossary.texi (Glossary): Refine. diff: === modified file 'doc/emacs/glossary.texi' --- doc/emacs/glossary.texi 2013-07-28 05:54:24 +0000 +++ doc/emacs/glossary.texi 2013-07-28 22:48:15 +0000 @@ -20,7 +20,7 @@ @xref{Quitting}. @item Active Region -Setting the mark (q.v.) at a position in the text also activates it. +Setting the mark (q.v.@:) at a position in the text also activates it. When the mark is active, we call the region an active region. @xref{Mark}. @@ -187,11 +187,6 @@ @item Character Terminal @xref{Glossary---Text Terminal}. -@item Chord -A chord is a key sequence (q.v.) in which the keys are pressed at the -same time. For example: @kbd{S-M-C-a}. You can hold down a chord to -repeat its command. - @item Click Event A click event is the kind of input event (q.v.@:) generated when you press a mouse button and release it without moving the mouse. @@ -1375,9 +1370,10 @@ level by aborting (q.v.@:) and quitting (q.v.). @xref{Quitting}. @item Transient Mark Mode -Transient Mark mode gives you much of the standard -selection-highlighting behavior of other editors. In GNU Emacs 23 and -onwards, it is enabled by default. @xref{Disabled Transient Mark}. +The default behavior of the mark (q.v.@:) and region (q.v.), in which +setting the mark activates it and highlights the region, is called +Transient Mark mode. In GNU Emacs 23 and onwards, it is enabled by +default. @xref{Disabled Transient Mark}. @item Transposition Transposing two units of text means putting each one into the place ------------------------------------------------------------ revno: 113579 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2013-07-29 00:43:01 +0200 message: lisp/desktop.el: Fix problem creating minibuffer(less,only) frames. (desktop--make-frame): Include `minibuffer' in the minimal set of parameters passed when creating a frame, because the minibuffer status of a frame cannot be changed later. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-28 22:34:32 +0000 +++ lisp/ChangeLog 2013-07-28 22:43:01 +0000 @@ -1,3 +1,9 @@ +2013-07-28 Juanma Barranquero + + * desktop.el (desktop--make-frame): Include `minibuffer' in the + minimal set of parameters passed when creating a frame, because + the minibuffer status of a frame cannot be changed later. + 2013-07-28 Stephen Berman * calendar/todo-mode.el (todo-rename-file): Fix incorrect use of === modified file 'lisp/desktop.el' --- lisp/desktop.el 2013-07-28 03:03:45 +0000 +++ lisp/desktop.el 2013-07-28 22:43:01 +0000 @@ -1394,7 +1394,7 @@ (make-frame-on-display display (cons '(visibility) (cl-loop - for param in '(left top width height) + for param in '(left top width height minibuffer) collect (assq param filtered-cfg)))))) (modify-frame-parameters frame (if (eq (frame-parameter frame 'fullscreen) fullscreen) ------------------------------------------------------------ revno: 113578 committer: Stephen Berman branch nick: trunk timestamp: Mon 2013-07-29 00:34:32 +0200 message: * calendar/todo-mode.el (todo-rename-file): Fix incorrect use of replace-regexp-in-string and inadvertent omissions in previous change. (todo-filter-items): Ensure only file names are comma-separated in renamed filtered items buffer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-28 03:03:45 +0000 +++ lisp/ChangeLog 2013-07-28 22:34:32 +0000 @@ -1,3 +1,10 @@ +2013-07-28 Stephen Berman + + * calendar/todo-mode.el (todo-rename-file): Fix incorrect use of + replace-regexp-in-string and inadvertent omissions in previous change. + (todo-filter-items): Ensure only file names are comma-separated in + renamed filtered items buffer. + 2013-07-28 Juanma Barranquero * desktop.el: Optionally force offscreen frames back onscreen. === modified file 'lisp/calendar/todo-mode.el' --- lisp/calendar/todo-mode.el 2013-07-27 15:58:56 +0000 +++ lisp/calendar/todo-mode.el 2013-07-28 22:34:32 +0000 @@ -1117,9 +1117,10 @@ (concat ".*" (regexp-quote soname) ".*\.tod[aorty]$") t))) (dolist (f files) - (let ((sfname (todo-short-file-name f)) - (fext (file-name-extension f t)) - (fbuf (find-buffer-visiting f))) + (let* ((sfname (todo-short-file-name f)) + (fext (file-name-extension f t)) + (fbuf (find-buffer-visiting f)) + (fbname (buffer-name fbuf))) (when (string-match (regexp-quote soname) sfname) (let* ((snfname (replace-match snname t t sfname)) (nfname (concat todo-directory snfname fext))) @@ -1135,7 +1136,14 @@ (t (rename-buffer (replace-regexp-in-string - (regexp-quote soname) snfname)))))))))))) + (regexp-quote soname) snname fbname)))))))))) + (setq todo-files (funcall todo-files-function) + todo-archives (funcall todo-files-function t)) + (when (string= todo-default-todo-file soname) + (setq todo-default-todo-file snname)) + (when (string= todo-global-current-todo-file oname) + (setq todo-global-current-todo-file nname)) + (todo-reevaluate-filelist-defcustoms))) (defun todo-delete-file () "Delete the current todo, archive or filtered items file. @@ -4159,7 +4167,8 @@ (regexp ".todr"))))) (rxfiles (when regexp (directory-files todo-directory t ".*\\.todr$" t))) - (file-exists (or (file-exists-p fname) rxfiles))) + (file-exists (or (file-exists-p fname) rxfiles)) + bufname) (cond ((and top new (natnump new)) (todo-filter-items-1 (cons 'top new) flist)) ((and (not new) file-exists) @@ -4173,10 +4182,15 @@ (todo-check-filtered-items-file)) (t (todo-filter-items-1 filter flist))) - (setq fname (replace-regexp-in-string "-" ", " - (todo-short-file-name fname))) + (dolist (s (split-string (todo-short-file-name fname) "-")) + (setq bufname (if bufname + (concat bufname (if (member s (mapcar + 'todo-short-file-name + todo-files)) + ", " "-") s) + s))) (rename-buffer (format (concat "%s for file" (if multi "s" "") - " \"%s\"") buf fname)))) + " \"%s\"") buf bufname)))) (defun todo-filter-items-1 (filter file-list) "Build a list of items by applying FILTER to FILE-LIST. ------------------------------------------------------------ revno: 113577 fixes bug: http://debbugs.gnu.org/14970 committer: Paul Eggert branch nick: trunk timestamp: Sun 2013-07-28 21:36:23 +0200 message: * frame.c (delete_frame): Avoid unnecessary 'this_f' test. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-07-28 15:22:27 +0000 +++ src/ChangeLog 2013-07-28 19:36:23 +0000 @@ -1,3 +1,7 @@ +2013-07-28 Paul Eggert + + * frame.c (delete_frame): Avoid unnecessary 'this_f' test (Bug#14970). + 2013-07-28 Eli Zaretskii * w32fns.c (w32_wnd_proc) : Make sure the === modified file 'src/frame.c' --- src/frame.c 2013-07-28 15:22:27 +0000 +++ src/frame.c 2013-07-28 19:36:23 +0000 @@ -1158,12 +1158,13 @@ FOR_EACH_FRAME (frames, this) { Lisp_Object fminiw; - struct frame *this_f; - - if (! EQ (this, frame) - && (this_f = XFRAME (this)) - && WINDOWP (fminiw = FRAME_MINIBUF_WINDOW (this_f)) - && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw)))) + + if (EQ (this, frame)) + continue; + + fminiw = FRAME_MINIBUF_WINDOW (XFRAME (this)); + + if (WINDOWP (fminiw) && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw)))) { /* If we MUST delete this frame, delete the other first. But do this only if FORCE equals `noelisp'. */ ------------------------------------------------------------ revno: 113576 fixes bug: http://debbugs.gnu.org/14970 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2013-07-28 18:22:27 +0300 message: Fix bug #14970 with crashes when deleting many frames on MS-Windows. src/w32fns.c (w32_wnd_proc) : Make sure the frame which got the message is still alive, before dereferencing its pointer. src/frame.c (delete_frame): Test "this" frame's minibuffer window to be a live window, before using it as such. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-07-27 13:08:03 +0000 +++ src/ChangeLog 2013-07-28 15:22:27 +0000 @@ -1,3 +1,12 @@ +2013-07-28 Eli Zaretskii + + * w32fns.c (w32_wnd_proc) : Make sure the + frame which got the message is still alive, before dereferencing + its pointer. (Bug#14970) + + * frame.c (delete_frame): Test "this" frame's minibuffer window to + be a live window, before using it as such. (Bug#14970) + 2013-07-27 Eli Zaretskii * w32term.c (w32_read_socket) : Call === modified file 'src/frame.c' --- src/frame.c 2013-07-16 14:52:22 +0000 +++ src/frame.c 2013-07-28 15:22:27 +0000 @@ -1157,10 +1157,13 @@ FOR_EACH_FRAME (frames, this) { + Lisp_Object fminiw; + struct frame *this_f; + if (! EQ (this, frame) - && EQ (frame, - WINDOW_FRAME (XWINDOW - (FRAME_MINIBUF_WINDOW (XFRAME (this)))))) + && (this_f = XFRAME (this)) + && WINDOWP (fminiw = FRAME_MINIBUF_WINDOW (this_f)) + && EQ (frame, WINDOW_FRAME (XWINDOW (fminiw)))) { /* If we MUST delete this frame, delete the other first. But do this only if FORCE equals `noelisp'. */ === modified file 'src/w32fns.c' --- src/w32fns.c 2013-07-19 01:24:35 +0000 +++ src/w32fns.c 2013-07-28 15:22:27 +0000 @@ -3213,6 +3213,8 @@ described by W was deleted, as indicated by its buffer field being reset to nil. */ f = x_window_to_frame (dpyinfo, hwnd); + if (!(f && FRAME_LIVE_P (f))) + break; w = XWINDOW (FRAME_SELECTED_WINDOW (f)); /* Punt if someone changed the frame's selected window behind our back. */ ------------------------------------------------------------ revno: 113575 committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2013-07-28 13:54:24 +0800 message: * doc/emacs/glossary.texi (Glossary): Add some entries. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-07-27 00:23:21 +0000 +++ doc/emacs/ChangeLog 2013-07-28 05:54:24 +0000 @@ -1,3 +1,7 @@ +2013-07-28 Xue Fuqiao + + * glossary.texi (Glossary): Add some entries. + 2013-07-27 Xue Fuqiao * maintaining.texi (VC Directory Commands): Mention `D' and `L' in === modified file 'doc/emacs/glossary.texi' --- doc/emacs/glossary.texi 2013-01-01 09:11:05 +0000 +++ doc/emacs/glossary.texi 2013-07-28 05:54:24 +0000 @@ -4,6 +4,7 @@ @c See file emacs.texi for copying conditions. @node Glossary @unnumbered Glossary +@cindex glossary @table @asis @anchor{Glossary---Abbrev} @@ -18,7 +19,10 @@ commands @kbd{C-]} and @kbd{M-x top-level} are used for this. @xref{Quitting}. -@c FIXME? Active Region +@item Active Region +Setting the mark (q.v.) at a position in the text also activates it. +When the mark is active, we call the region an active region. +@xref{Mark}. @item Alt Alt is the name of a modifier bit that a keyboard input character may @@ -183,6 +187,11 @@ @item Character Terminal @xref{Glossary---Text Terminal}. +@item Chord +A chord is a key sequence (q.v.) in which the keys are pressed at the +same time. For example: @kbd{S-M-C-a}. You can hold down a chord to +repeat its command. + @item Click Event A click event is the kind of input event (q.v.@:) generated when you press a mouse button and release it without moving the mouse. @@ -1365,7 +1374,10 @@ (q.v.), and not in the middle of a command. You can get back to top level by aborting (q.v.@:) and quitting (q.v.). @xref{Quitting}. -@c FIXME? Transient Mark Mode +@item Transient Mark Mode +Transient Mark mode gives you much of the standard +selection-highlighting behavior of other editors. In GNU Emacs 23 and +onwards, it is enabled by default. @xref{Disabled Transient Mark}. @item Transposition Transposing two units of text means putting each one into the place