Now on revision 113549. ------------------------------------------------------------ revno: 113549 fixes bug: http://debbugs.gnu.org/14946 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2013-07-26 09:56:35 +0300 message: Fix bug #14946 with documentation of fringe-mode the variable. doc/emacs/display.texi (Fringes): Document the variable fringe-mode. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-07-03 03:20:04 +0000 +++ doc/emacs/ChangeLog 2013-07-26 06:56:35 +0000 @@ -1,3 +1,8 @@ +2013-07-26 Eli Zaretskii + + * display.texi (Fringes): Document the variable fringe-mode. + (Bug#14946) + 2013-07-03 Glenn Morris * maintaining.texi (EDE): Fix cross-reference. === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2013-06-03 08:51:50 +0000 +++ doc/emacs/display.texi 2013-07-26 06:56:35 +0000 @@ -1017,12 +1017,15 @@ @findex set-fringe-style @findex fringe-mode +@vindex fringe-mode @r{(variable)} On graphical displays, each Emacs window normally has narrow @dfn{fringes} on the left and right edges. The fringes are used to display symbols that provide information about the text in the window. You can type @kbd{M-x fringe-mode} to disable the fringes, or modify their width. This command affects fringes in all frames; to modify fringes on the selected frame only, use @kbd{M-x set-fringe-style}. +You can make your changes to the fringes permanent by customizing the +variable @code{fringe-mode}. The most common use of the fringes is to indicate a continuation line (@pxref{Continuation Lines}). When one line of text is split ------------------------------------------------------------ revno: 113548 fixes bug: http://debbugs.gnu.org/14857 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-07-25 22:45:15 -0400 message: * lisp/align.el (align-regexp): Doc fix. (align-region): Explicit error if subexpression missing/does not match. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-26 01:55:06 +0000 +++ lisp/ChangeLog 2013-07-26 02:45:15 +0000 @@ -1,5 +1,8 @@ 2013-07-26 Glenn Morris + * align.el (align-regexp): Doc fix. (Bug#14857) + (align-region): Explicit error if subexpression missing/does not match. + * simple.el (global-visual-line-mode): Do not duplicate the mode lighter. (Bug#14858) === modified file 'lisp/align.el' --- lisp/align.el 2013-01-01 09:11:05 +0000 +++ lisp/align.el 2013-07-26 02:45:15 +0000 @@ -906,15 +906,8 @@ ;;;###autoload (defun align-regexp (beg end regexp &optional group spacing repeat) "Align the current region using an ad-hoc rule read from the minibuffer. -BEG and END mark the limits of the region. This function will prompt -for the REGEXP to align with. If no prefix arg was specified, you -only need to supply the characters to be lined up and any preceding -whitespace is replaced. If a prefix arg was specified, the full -regexp with parenthesized whitespace should be supplied; it will also -prompt for which parenthesis GROUP within REGEXP to modify, the amount -of SPACING to use, and whether or not to REPEAT the rule throughout -the line. See `align-rules-list' for more information about these -options. +BEG and END mark the limits of the region. Interactively, this function +prompts for the regular expression REGEXP to align with. For example, let's say you had a list of phone numbers, and wanted to align them so that the opening parentheses would line up: @@ -925,8 +918,29 @@ Joe (123) 456-7890 There is no predefined rule to handle this, but you could easily do it -using a REGEXP like \"(\". All you would have to do is to mark the -region, call `align-regexp' and type in that regular expression." +using a REGEXP like \"(\". Interactively, all you would have to do is +to mark the region, call `align-regexp' and enter that regular expression. + +REGEXP must contain at least one parenthesized subexpression, typically +whitespace of the form \"\\\\(\\\\s-*\\\\)\". In normal interactive use, +this is automatically added to the start of your regular expression after +you enter it. You only need to supply the characters to be lined up, and +any preceding whitespace is replaced. + +If you specify a prefix argument (or use this function non-interactively), +you must enter the full regular expression, including the subexpression. +The function also then prompts for which subexpression parenthesis GROUP +\(default 1) within REGEXP to modify, the amount of SPACING (default +`align-default-spacing') to use, and whether or not to REPEAT the rule +throughout the line. + +See `align-rules-list' for more information about these options. + +The non-interactive form of the previous example would look something like: + \(align-regexp (point-min) (point-max) \"\\\\(\\\\s-*\\\\)(\") + +This function is a nothing more than a small wrapper that helps you +construct a rule to pass to `align-region', which does the real work." (interactive (append (list (region-beginning) (region-end)) @@ -1498,6 +1512,9 @@ (setq rule-beg (match-beginning first) save-match-data (match-data)) + (or rule-beg + (error "No match for subexpression %s" first)) + ;; unless the `valid' attribute is set, and tells ;; us that the rule is not valid at this point in ;; the code.. ------------------------------------------------------------ revno: 113547 fixes bug: http://debbugs.gnu.org/14858 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-07-25 21:55:06 -0400 message: * lisp/simple.el (global-visual-line-mode): Do not duplicate the mode lighter. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-25 09:58:27 +0000 +++ lisp/ChangeLog 2013-07-26 01:55:06 +0000 @@ -1,3 +1,8 @@ +2013-07-26 Glenn Morris + + * simple.el (global-visual-line-mode): + Do not duplicate the mode lighter. (Bug#14858) + 2013-07-25 Martin Rudalics * window.el (display-buffer): In display-buffer bind === modified file 'lisp/simple.el' --- lisp/simple.el 2013-07-17 16:47:49 +0000 +++ lisp/simple.el 2013-07-26 01:55:06 +0000 @@ -5530,8 +5530,7 @@ (visual-line-mode 1)) (define-globalized-minor-mode global-visual-line-mode - visual-line-mode turn-on-visual-line-mode - :lighter " vl") + visual-line-mode turn-on-visual-line-mode) (defun transpose-chars (arg) ------------------------------------------------------------ revno: 113546 fixes bug: http://debbugs.gnu.org/14658 author: Micah Anderson committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-07-25 21:45:52 -0400 message: * etc/spook.lines: Additions (tiny change) diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2013-07-16 11:41:06 +0000 +++ etc/ChangeLog 2013-07-26 01:45:52 +0000 @@ -1,3 +1,7 @@ +2013-07-26 Micah Anderson (tiny change) + + * spook.lines: Additions. (Bug#14658) + 2013-07-16 Jan Djärv * NEWS: Document blink-cursor-blinks and blink timers stopped. === modified file 'etc/spook.lines' Binary files etc/spook.lines 2012-06-01 07:10:49 +0000 and etc/spook.lines 2013-07-26 01:45:52 +0000 differ ------------------------------------------------------------ revno: 113545 author: Andreas Schwab committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2013-07-25 23:40:51 +0000 message: gnus-art.el (gnus-button-url-regexp): Make it match url in which punctuation characters follow parentheses (bug#14950) diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-07-23 07:04:24 +0000 +++ lisp/gnus/ChangeLog 2013-07-25 23:40:51 +0000 @@ -1,3 +1,8 @@ +2013-07-25 Andreas Schwab + + * gnus-art.el (gnus-button-url-regexp): Make it match url in which + punctuation characters follow parentheses (bug#14950). + 2013-07-23 Katsumi Yamaoka * gnus.el (gnus-continuum-version): === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2013-07-19 14:50:21 +0000 +++ lisp/gnus/gnus-art.el 2013-07-25 23:40:51 +0000 @@ -7177,15 +7177,17 @@ "\\(?:" ;; Match paired parentheses, e.g. in Wikipedia URLs: ;; http://thread.gmane.org/47B4E3B2.3050402@gmail.com - "[" chars punct "]+" "(" "[" chars punct "]+" "[" chars "]*)" "[" chars "]*" + "[" chars punct "]+" "(" "[" chars punct "]+" "[" chars "]*)" + "\\(?:" "[" chars punct "]+" "[" chars "]" "\\)?" "\\|" - "[" chars punct "]+" "[" chars "]" + "[" chars punct "]+" "[" chars "]" "\\)")) (concat ;; XEmacs 21.4 doesn't support POSIX. "\\([-a-z0-9_=!?#$@~%&*+\\/:;.,]\\|\\w\\)+" "\\([-a-z0-9_=#$@~%&*+\\/]\\|\\w\\)")) "\\)") "Regular expression that matches URLs." + :version "24.4" :group 'gnus-article-buttons :type 'regexp) ------------------------------------------------------------ revno: 113544 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-07-25 08:46:00 -0700 message: Add Makefile rules for ido.texi * doc/misc/Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add ido. (ido, $(buildinfodir)/ido$(INFO_EXT), ido.dvi, ido.pdf): New rules. * info/dir: Add ido. diff: === modified file 'ChangeLog' --- ChangeLog 2013-07-25 07:10:56 +0000 +++ ChangeLog 2013-07-25 15:46:00 +0000 @@ -1,5 +1,7 @@ 2013-07-25 Glenn Morris + * info/dir: Add ido. + * make-dist: Add a --tests option, to include test/. 2013-07-24 Glenn Morris === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-07-25 07:10:56 +0000 +++ doc/misc/ChangeLog 2013-07-25 15:46:00 +0000 @@ -1,5 +1,8 @@ 2013-07-25 Glenn Morris + * Makefile.in (INFO_TARGETS, DVI_TARGETS, PDF_TARGETS): Add ido. + (ido, $(buildinfodir)/ido$(INFO_EXT), ido.dvi, ido.pdf): New rules. + * erc.texi (Special Features): Update contact information. (History): Avoid using @email. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2013-07-23 22:55:38 +0000 +++ doc/misc/Makefile.in 2013-07-25 15:46:00 +0000 @@ -45,7 +45,7 @@ INFO_TARGETS = ada-mode auth autotype bovine calc ccmode cl \ dbus dired-x ebrowse ede ediff edt eieio \ emacs-mime epa erc ert eshell eudc efaq \ - flymake forms gnus emacs-gnutls htmlfontify idlwave info.info \ + flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \ mairix-el message mh-e newsticker nxml-mode \ org pcl-cvs pgg rcirc remember reftex sasl \ sc semantic ses sieve smtpmail speedbar srecode tramp \ @@ -79,6 +79,7 @@ emacs-gnutls.dvi \ htmlfontify.dvi \ idlwave.dvi \ + ido.dvi \ info.dvi \ mairix-el.dvi \ message.dvi \ @@ -135,6 +136,7 @@ htmlfontify.pdf \ emacs-gnutls.pdf \ idlwave.pdf \ + ido.pdf \ info.pdf \ mairix-el.pdf \ message.pdf \ @@ -452,6 +454,15 @@ idlwave.pdf: ${srcdir}/idlwave.texi ${gfdl} $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi +ido : $(buildinfodir)/ido$(INFO_EXT) +$(buildinfodir)/ido$(INFO_EXT): ${srcdir}/ido.texi $(emacsdir)/emacsver.texi ${gfdl} + $(mkinfodir) + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/ido.texi +ido.dvi: ${srcdir}/ido.texi $(emacsdir)/emacsver.texi ${gfdl} + $(ENVADD) $(TEXI2DVI) ${srcdir}/ido.texi +ido.pdf: ${srcdir}/ido.texi $(emacsdir)/emacsver.texi ${gfdl} + $(ENVADD) $(TEXI2PDF) ${srcdir}/ido.texi + # NB this one needs --no-split even without a .info extension. # Avoid name clash with overall "info" target. info.info : $(buildinfodir)/info$(INFO_EXT) === modified file 'info/dir' --- info/dir 2013-01-04 09:43:08 +0000 +++ info/dir 2013-07-25 15:46:00 +0000 @@ -75,6 +75,7 @@ * Forms: (forms). Emacs package for editing data bases by filling in forms. * Htmlfontify: (htmlfontify). Convert source code to html. +* Ido: (ido). Interactively do things with buffers and files. * PCL-CVS: (pcl-cvs). Emacs front-end to CVS. * RefTeX: (reftex). Emacs support for LaTeX cross-references and citations. ------------------------------------------------------------ revno: 113543 committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-07-25 06:18:09 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/dired.el' --- lisp/dired.el 2013-07-25 07:10:56 +0000 +++ lisp/dired.el 2013-07-25 10:18:09 +0000 @@ -4367,7 +4367,7 @@ ;;;*** -;;;### (autoloads nil "dired-x" "dired-x.el" "9bfe6b761cb88b4d3ab78a7905979371") +;;;### (autoloads nil "dired-x" "dired-x.el" "1419d865898f84c17f172320e578380c") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ ------------------------------------------------------------ revno: 113542 committer: martin rudalics branch nick: trunk timestamp: Thu 2013-07-25 11:58:27 +0200 message: In display-buffer bind split-window-keep-point to t, bug#14829. * window.el (display-buffer): In display-buffer bind split-window-keep-point to t, bug#14829. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-25 09:24:26 +0000 +++ lisp/ChangeLog 2013-07-25 09:58:27 +0000 @@ -1,3 +1,8 @@ +2013-07-25 Martin Rudalics + + * window.el (display-buffer): In display-buffer bind + split-window-keep-point to t, bug#14829. + 2013-07-25 Juanma Barranquero * desktop.el: Rename internal "desktop-X" frame params to "desktop--X". === modified file 'lisp/window.el' --- lisp/window.el 2013-07-06 14:24:54 +0000 +++ lisp/window.el 2013-07-25 09:58:27 +0000 @@ -5470,6 +5470,9 @@ (let ((buffer (if (bufferp buffer-or-name) buffer-or-name (get-buffer buffer-or-name))) + ;; Make sure that when we split windows the old window keeps + ;; point, bug#14829. + (split-window-keep-point t) ;; Handle the old form of the first argument. (inhibit-same-window (and action (not (listp action))))) (unless (listp action) (setq action nil)) ------------------------------------------------------------ revno: 113541 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2013-07-25 11:24:26 +0200 message: lisp/desktop.el: Use pcase-let, pcase-let* in a few places. (desktop--select-frame, desktop--sort-states, desktop-restore-frames): Deobfuscate access to desktop--mini values. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-25 08:35:04 +0000 +++ lisp/ChangeLog 2013-07-25 09:24:26 +0000 @@ -5,6 +5,8 @@ (desktop--filter-save-desktop-parm, desktop--process-minibuffer-frames) (desktop--select-frame, desktop--sort-states, desktop-restore-frames): Change accordingly. + (desktop--select-frame, desktop--sort-states, desktop-restore-frames): + Use pcase-let, pcase-let* to deobfuscate access to desktop--mini values. 2013-07-25 Glenn Morris === modified file 'lisp/desktop.el' --- lisp/desktop.el 2013-07-25 08:35:04 +0000 +++ lisp/desktop.el 2013-07-25 09:24:26 +0000 @@ -1228,33 +1228,34 @@ ;; session has already been loaded. The other main use case, which ;; is the initial desktop-read upon starting Emacs, should usually ;; only have one, or very few, frame(s) to reuse. - (cond (;; When the target is tty, every existing frame is reusable. - (null display) + (cond ((null display) + ;; When the target is tty, every existing frame is reusable. (setq frame (desktop--find-frame nil display))) - (;; If the frame has its own minibuffer, let's see whether + ((car (setq mini (cdr (assq 'desktop--mini frame-cfg)))) + ;; If the frame has its own minibuffer, let's see whether ;; that frame has already been loaded (which can happen after ;; M-x desktop-read). - (car (setq mini (cdr (assq 'desktop--mini frame-cfg)))) (setq frame (or (desktop--find-frame (lambda (f m) (equal (frame-parameter f 'desktop--mini) m)) display mini)))) - (;; For minibufferless frames, check whether they already exist, + (mini + ;; For minibufferless frames, check whether they already exist, ;; and that they are linked to the right minibuffer frame. - mini (setq frame (desktop--find-frame (lambda (f n) - (let ((m (frame-parameter f 'desktop--mini))) + (pcase-let (((and m `(,hasmini ,num)) + (frame-parameter f 'desktop--mini))) (and m - (null (cl-first m)) - (= (cl-second m) n) + (null hasmini) + (= num n) (equal (cl-second (frame-parameter (window-frame (minibuffer-window f)) 'desktop--mini)) n)))) display (cl-second mini)))) - (;; Default to just finding a frame in the same display. - t + (t + ;; Default to just finding a frame in the same display. (setq frame (desktop--find-frame nil display)))) ;; If found, remove from the list. (when frame @@ -1320,14 +1321,12 @@ ;; Order: default minibuffer frame ;; other frames with minibuffer, ascending ID ;; minibufferless frames, ascending ID - (let ((dm1 (cdr (assq 'desktop--mini (car state1)))) - (dm2 (cdr (assq 'desktop--mini (car state2))))) - (cond ((cl-third dm1) t) - ((cl-third dm2) nil) - ((eq (cl-first dm1) (cl-first dm2)) - (< (cl-second dm1) (cl-second dm2))) - (t - (cl-first dm1))))) + (pcase-let ((`(,_p1 ,hasmini1 ,num1 ,default1) (assq 'desktop--mini (car state1))) + (`(,_p2 ,hasmini2 ,num2 ,default2) (assq 'desktop--mini (car state2)))) + (cond (default1 t) + (default2 nil) + ((eq hasmini1 hasmini2) (< num1 num2)) + (t hasmini1)))) (defun desktop-restoring-frames-p () "True if calling `desktop-restore-frames' will actually restore frames." @@ -1353,10 +1352,10 @@ (dolist (state desktop-saved-frame-states) (condition-case err - (let* ((frame-cfg (car state)) - (window-cfg (cdr state)) - (d-mini (cdr (assq 'desktop--mini frame-cfg))) - num frame to-tty) + (pcase-let* ((`(,frame-cfg . ,window-cfg) state) + ((and d-mini `(,hasmini ,num ,default)) + (cdr (assq 'desktop--mini frame-cfg))) + (frame nil) (to-tty nil)) ;; Only set target if forcing displays and the target display is different. (if (or (not forcing) (equal target (or (assq 'display frame-cfg) '(display . nil)))) @@ -1379,15 +1378,14 @@ (cond ((null d-mini)) ;; No desktop--mini. Process as normal frame. (to-tty) ;; Ignore minibuffer stuff and process as normal frame. - ((cl-first d-mini) ;; Frame has minibuffer (or it is minibuffer-only). - (setq num (cl-second d-mini)) + (hasmini ;; Frame has minibuffer (or it is minibuffer-only). (when (eq (cdr (assq 'minibuffer frame-cfg)) 'only) (setq frame-cfg (append '((tool-bar-lines . 0) (menu-bar-lines . 0)) frame-cfg)))) (t ;; Frame depends on other frame's minibuffer window. - (let ((mb-frame (cdr (assq (cl-second d-mini) frame-mb-map)))) + (let ((mb-frame (cdr (assq num frame-mb-map)))) (unless (frame-live-p mb-frame) - (error "Minibuffer frame %s not found" (cl-second d-mini))) + (error "Minibuffer frame %s not found" num)) (let ((mb-param (assq 'minibuffer frame-cfg)) (mb-window (minibuffer-window mb-frame))) (unless (and (window-live-p mb-window) @@ -1400,9 +1398,9 @@ ;; restore the window config. (setq frame (desktop--make-frame frame-cfg window-cfg)) ;; Set default-minibuffer if required. - (when (cl-third d-mini) (setq default-minibuffer-frame frame)) - ;; Store frame/NUM to assign to minibufferless frames. - (when num (push (cons num frame) frame-mb-map)))) + (when default (setq default-minibuffer-frame frame)) + ;; Store NUM/frame to assign to minibufferless frames. + (when hasmini (push (cons num frame) frame-mb-map)))) (error (delay-warning 'desktop (error-message-string err) :error)))) ------------------------------------------------------------ revno: 113540 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2013-07-25 10:35:04 +0200 message: lisp/desktop.el: Rename internal "desktop-X" frame params to "desktop--X". (desktop-filter-parameters-alist, desktop--filter-restore-desktop-parm) (desktop--filter-save-desktop-parm, desktop--process-minibuffer-frames) (desktop--select-frame, desktop--sort-states, desktop-restore-frames): Change accordingly. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-25 07:10:56 +0000 +++ lisp/ChangeLog 2013-07-25 08:35:04 +0000 @@ -1,3 +1,11 @@ +2013-07-25 Juanma Barranquero + + * desktop.el: Rename internal "desktop-X" frame params to "desktop--X". + (desktop-filter-parameters-alist, desktop--filter-restore-desktop-parm) + (desktop--filter-save-desktop-parm, desktop--process-minibuffer-frames) + (desktop--select-frame, desktop--sort-states, desktop-restore-frames): + Change accordingly. + 2013-07-25 Glenn Morris * dired-x.el (dired-mark-extension): Convert comment to doc string. === modified file 'lisp/desktop.el' --- lisp/desktop.el 2013-07-25 00:37:56 +0000 +++ lisp/desktop.el 2013-07-25 08:35:04 +0000 @@ -878,30 +878,30 @@ ;; ---------------------------------------------------------------------------- (defvar desktop-filter-parameters-alist - '((background-color . desktop--filter-*-color) - (buffer-list . t) - (buffer-predicate . t) - (buried-buffer-list . t) - (desktop-font . desktop--filter-restore-desktop-parm) - (desktop-fullscreen . desktop--filter-restore-desktop-parm) - (desktop-height . desktop--filter-restore-desktop-parm) - (desktop-width . desktop--filter-restore-desktop-parm) - (font . desktop--filter-save-desktop-parm) - (font-backend . t) - (foreground-color . desktop--filter-*-color) - (fullscreen . desktop--filter-save-desktop-parm) - (height . desktop--filter-save-desktop-parm) - (left . desktop--filter-iconified-position) - (minibuffer . desktop--filter-minibuffer) - (name . t) - (outer-window-id . t) - (parent-id . t) - (top . desktop--filter-iconified-position) - (tty . desktop--filter-tty*) - (tty-type . desktop--filter-tty*) - (width . desktop--filter-save-desktop-parm) - (window-id . t) - (window-system . t)) + '((background-color . desktop--filter-*-color) + (buffer-list . t) + (buffer-predicate . t) + (buried-buffer-list . t) + (desktop--font . desktop--filter-restore-desktop-parm) + (desktop--fullscreen . desktop--filter-restore-desktop-parm) + (desktop--height . desktop--filter-restore-desktop-parm) + (desktop--width . desktop--filter-restore-desktop-parm) + (font . desktop--filter-save-desktop-parm) + (font-backend . t) + (foreground-color . desktop--filter-*-color) + (fullscreen . desktop--filter-save-desktop-parm) + (height . desktop--filter-save-desktop-parm) + (left . desktop--filter-iconified-position) + (minibuffer . desktop--filter-minibuffer) + (name . t) + (outer-window-id . t) + (parent-id . t) + (top . desktop--filter-iconified-position) + (tty . desktop--filter-tty*) + (tty-type . desktop--filter-tty*) + (width . desktop--filter-save-desktop-parm) + (window-id . t) + (window-system . t)) "Alist of frame parameters and filtering functions. Each element is a cons (PARAM . FILTER), where PARAM is a parameter @@ -972,27 +972,27 @@ t))) (defun desktop--filter-restore-desktop-parm (current parameters saving) - ;; When switching to a GUI frame, convert desktop-XXX parameter to XXX + ;; When switching to a GUI frame, convert desktop--XXX parameter to XXX (or saving (not (desktop-switch-to-gui-p parameters)) (let ((val (cdr current))) (if (eq val :desktop-processed) nil (cons (intern (substring (symbol-name (car current)) - 8)) ;; (length "desktop-") + 9)) ;; (length "desktop--") val))))) (defun desktop--filter-save-desktop-parm (current parameters saving) - ;; When switching to a tty frame, save parameter XXX as desktop-XXX so it + ;; When switching to a tty frame, save parameter XXX as desktop--XXX so it ;; can be restored in a subsequent GUI session, unless it already exists. (cond (saving t) ((desktop-switch-to-tty-p parameters) - (let ((sym (intern (format "desktop-%s" (car current))))) + (let ((sym (intern (format "desktop--%s" (car current))))) (if (assq sym parameters) nil (cons sym (cdr current))))) ((desktop-switch-to-gui-p parameters) - (let* ((dtp (assq (intern (format "desktop-%s" (car current))) + (let* ((dtp (assq (intern (format "desktop--%s" (car current))) parameters)) (val (cdr dtp))) (if (eq val :desktop-processed) @@ -1047,34 +1047,34 @@ filtered)) (defun desktop--process-minibuffer-frames (frames) - ;; Adds a desktop-mini parameter to frames - ;; desktop-mini is a list (MINIBUFFER NUMBER DEFAULT?) where + ;; Adds a desktop--mini parameter to frames + ;; desktop--mini is a list (MINIBUFFER NUMBER DEFAULT?) where ;; MINIBUFFER t if the frame (including minibuffer-only) owns a minibuffer ;; NUMBER if MINIBUFFER = t, an ID for the frame; if nil, the ID of ;; the frame containing the minibuffer used by this frame ;; DEFAULT? if t, this frame is the value of default-minibuffer-frame (let ((count 0)) - ;; Reset desktop-mini for all frames + ;; Reset desktop--mini for all frames (dolist (frame (frame-list)) - (set-frame-parameter frame 'desktop-mini nil)) + (set-frame-parameter frame 'desktop--mini nil)) ;; Number all frames with its own minibuffer (dolist (frame (minibuffer-frame-list)) - (set-frame-parameter frame 'desktop-mini + (set-frame-parameter frame 'desktop--mini (list t (cl-incf count) (eq frame default-minibuffer-frame)))) ;; Now link minibufferless frames with their minibuffer frames (dolist (frame frames) - (unless (frame-parameter frame 'desktop-mini) + (unless (frame-parameter frame 'desktop--mini) (let ((mb-frame (window-frame (minibuffer-window frame)))) ;; Frames whose minibuffer frame has been filtered out will have - ;; desktop-mini = nil, so desktop-restore-frames will restore them - ;; according to their minibuffer parameter. Set up desktop-mini + ;; desktop--mini = nil, so desktop-restore-frames will restore them + ;; according to their minibuffer parameter. Set up desktop--mini ;; for the rest. (when (memq mb-frame frames) - (set-frame-parameter frame 'desktop-mini + (set-frame-parameter frame 'desktop--mini (list nil - (cl-second (frame-parameter mb-frame 'desktop-mini)) + (cl-second (frame-parameter mb-frame 'desktop--mini)) nil)))))))) (defun desktop-save-frames () @@ -1234,23 +1234,23 @@ (;; If the frame has its own minibuffer, let's see whether ;; that frame has already been loaded (which can happen after ;; M-x desktop-read). - (car (setq mini (cdr (assq 'desktop-mini frame-cfg)))) + (car (setq mini (cdr (assq 'desktop--mini frame-cfg)))) (setq frame (or (desktop--find-frame (lambda (f m) - (equal (frame-parameter f 'desktop-mini) m)) + (equal (frame-parameter f 'desktop--mini) m)) display mini)))) (;; For minibufferless frames, check whether they already exist, ;; and that they are linked to the right minibuffer frame. mini (setq frame (desktop--find-frame (lambda (f n) - (let ((m (frame-parameter f 'desktop-mini))) + (let ((m (frame-parameter f 'desktop--mini))) (and m (null (cl-first m)) (= (cl-second m) n) (equal (cl-second (frame-parameter (window-frame (minibuffer-window f)) - 'desktop-mini)) + 'desktop--mini)) n)))) display (cl-second mini)))) (;; Default to just finding a frame in the same display. @@ -1320,8 +1320,8 @@ ;; Order: default minibuffer frame ;; other frames with minibuffer, ascending ID ;; minibufferless frames, ascending ID - (let ((dm1 (cdr (assq 'desktop-mini (car state1)))) - (dm2 (cdr (assq 'desktop-mini (car state2))))) + (let ((dm1 (cdr (assq 'desktop--mini (car state1)))) + (dm2 (cdr (assq 'desktop--mini (car state2))))) (cond ((cl-third dm1) t) ((cl-third dm2) nil) ((eq (cl-first dm1) (cl-first dm2)) @@ -1355,7 +1355,7 @@ (condition-case err (let* ((frame-cfg (car state)) (window-cfg (cdr state)) - (d-mini (cdr (assq 'desktop-mini frame-cfg))) + (d-mini (cdr (assq 'desktop--mini frame-cfg))) num frame to-tty) ;; Only set target if forcing displays and the target display is different. (if (or (not forcing) @@ -1377,7 +1377,7 @@ ;; global state; it's best to do it here than add a bunch of global ;; variables to pass info back-and-forth to/from the filter function. (cond - ((null d-mini)) ;; No desktop-mini. Process as normal frame. + ((null d-mini)) ;; No desktop--mini. Process as normal frame. (to-tty) ;; Ignore minibuffer stuff and process as normal frame. ((cl-first d-mini) ;; Frame has minibuffer (or it is minibuffer-only). (setq num (cl-second d-mini)) ------------------------------------------------------------ revno: 113539 fixes bug: http://debbugs.gnu.org/14936 committer: Paul Eggert branch nick: trunk timestamp: Thu 2013-07-25 09:07:47 +0100 message: * fileio.c (Finsert_file_contents): Use a more-conservative fix. diff: === modified file 'src/fileio.c' --- src/fileio.c 2013-07-25 07:29:36 +0000 +++ src/fileio.c 2013-07-25 08:07:47 +0000 @@ -3860,10 +3860,7 @@ if (same_at_start - BEGV_BYTE == end_offset - beg_offset) { emacs_close (fd); - - /* Discard the unwind protect for closing the file, and any - unwind protect for restoring point. */ - specpdl_ptr = specpdl + fd_index; + clear_unwind_protect (fd_index); /* Truncate the buffer to the size of the file. */ del_range_1 (same_at_start, same_at_end, 0, 0); ------------------------------------------------------------ revno: 113538 fixes bug: http://debbugs.gnu.org/14936 committer: Paul Eggert branch nick: trunk timestamp: Thu 2013-07-25 08:29:36 +0100 message: * fileio.c (Finsert_file_contents): Avoid double-close. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-07-24 17:36:42 +0000 +++ src/ChangeLog 2013-07-25 07:29:36 +0000 @@ -1,3 +1,7 @@ +2013-07-25 Paul Eggert + + * fileio.c (Finsert_file_contents): Avoid double-close (Bug#14936). + 2013-07-24 Eli Zaretskii * xdisp.c (redisplay_window): Instead of moving point out of === modified file 'src/fileio.c' --- src/fileio.c 2013-07-19 01:24:35 +0000 +++ src/fileio.c 2013-07-25 07:29:36 +0000 @@ -3860,7 +3860,11 @@ if (same_at_start - BEGV_BYTE == end_offset - beg_offset) { emacs_close (fd); - specpdl_ptr--; + + /* Discard the unwind protect for closing the file, and any + unwind protect for restoring point. */ + specpdl_ptr = specpdl + fd_index; + /* Truncate the buffer to the size of the file. */ del_range_1 (same_at_start, same_at_end, 0, 0); goto handled; ------------------------------------------------------------ revno: 113537 [merge] committer: Glenn Morris branch nick: trunk timestamp: Thu 2013-07-25 00:10:56 -0700 message: Merge from emacs-24; up to r111392 diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-07-24 22:32:48 +0000 +++ doc/misc/ChangeLog 2013-07-25 07:10:56 +0000 @@ -1,3 +1,26 @@ +2013-07-25 Glenn Morris + + * erc.texi (Special Features): Update contact information. + (History): Avoid using @email. + + * eshell.texi (Bugs and ideas): Minor updates. + + * faq.texi (Reporting bugs, Origin of the term Emacs) + (Setting up a customization file) + (Using an already running Emacs process, Turning off beeping) + (Packages that do not come with Emacs) + (Replying to the sender of a message): Avoid using @email. + + * pcl-cvs.texi (Contributors, Bugs): Avoid using @email. + + * reftex.texi (Imprint): Avoid using @email. + + * ses.texi (Top): Update bug reporting instructions. + (Acknowledgments): Avoid using @email. + + * woman.texi (Introduction, Background): Remove outdated information. + (Bugs, Acknowledgments): Avoid using @email. + 2013-07-24 Xue Fuqiao * ido.texi: New file. === modified file 'doc/misc/erc.texi' --- doc/misc/erc.texi 2013-05-28 01:05:41 +0000 +++ doc/misc/erc.texi 2013-07-25 07:10:56 +0000 @@ -234,9 +234,8 @@ Different channels and servers may have different language encodings. -In addition, it is possible to translate the messages that ERC uses -into multiple languages. Please contact the developers of Emacs at -@email{emacs-devel@@gnu.org} if you are interested in helping with the +multiple languages. Please contact the Emacs developers +if you are interested in helping with the translation effort. @item user scripting @@ -784,9 +783,9 @@ @chapter History @cindex history, of ERC -ERC was originally written by Alexander L. Belikoff -@email{abel@@bfr.co.il} and Sergey Berezin -@email{sergey.berezin@@cs.cmu.edu}. They stopped development around +@c abel@@bfr.co.il, sergey.berezin@@cs.cmu.edu +ERC was originally written by Alexander L. Belikoff and Sergey Berezin. +They stopped development around December 1999. Their last released version was ERC 2.0. P.S.: If one of the original developers of ERC reads this, we'd like to @@ -796,8 +795,9 @@ @itemize @item 2001 -In June 2001, Mario Lang @email{mlang@@delysid.org} and Alex Schroeder -@email{alex@@gnu.org} took over development and created a ERC Project at +@c mlang@@delysid.org, alex@@gnu.org +In June 2001, Mario Lang and Alex Schroeder +took over development and created a ERC Project at @uref{http://sourceforge.net/projects/erc}. In reaction to a mail about the new ERC development effort, Sergey @@ -825,7 +825,8 @@ @item 2005 -ERC 5.0 was released. Michael Olson @email{mwolson@@gnu.org} became +@c mwolson@@gnu.org +ERC 5.0 was released. Michael Olson became the release manager and eventually the maintainer. After some discussion between him and the Emacs developers, it was === modified file 'doc/misc/eshell.texi' --- doc/misc/eshell.texi 2013-06-24 06:58:52 +0000 +++ doc/misc/eshell.texi 2013-07-25 07:10:56 +0000 @@ -819,16 +819,18 @@ @cindex known bugs @cindex bugs, known -If you find a bug or misfeature, don't hesitate to let me know! Send -email to @email{johnw@@gnu.org}. Feature requests should also be sent -there. I prefer discussing one thing at a time. If you find several +If you find a bug or misfeature, don't hesitate to report it, by +using @kbd{M-x report-emacs-bug}. The same applies to feature requests. +It is best to discuss one thing at a time. If you find several unrelated bugs, please report them separately. +@ignore If you have ideas for improvements, or if you have written some extensions to this package, I would like to hear from you. I hope you find this package useful! +@end ignore -Below is a complete list of known problems with Eshell version 2.4.2, +Below is a list of some known problems with Eshell version 2.4.2, which is the version included with Emacs 22. @table @asis === modified file 'doc/misc/faq.texi' --- doc/misc/faq.texi 2013-03-08 08:37:59 +0000 +++ doc/misc/faq.texi 2013-07-25 07:10:56 +0000 @@ -444,9 +444,9 @@ The correct way to report Emacs bugs is to use the command @kbd{M-x report-emacs-bug}. It sets up a mail buffer with the -essential information and the correct e-mail address, which is -@email{bug-gnu-emacs@@gnu.org} for the released versions of Emacs. -Anything sent to @email{bug-gnu-emacs@@gnu.org} also appears in the +essential information and the correct e-mail address, +@email{bug-gnu-emacs@@gnu.org}. +Anything sent there also appears in the newsgroup @uref{news:gnu.emacs.bug}, but please use e-mail instead of news to submit the bug report. This ensures a reliable return address so you can be contacted for further details. @@ -459,13 +459,17 @@ RMS says: @quotation -Sending bug reports to @email{help-gnu-emacs@@gnu.org} (which has the -effect of posting on @uref{news:gnu.emacs.help}) is undesirable because -it takes the time of an unnecessarily large group of people, most of -whom are just users and have no idea how to fix these problem. -@email{bug-gnu-emacs@@gnu.org} reaches a much smaller group of people -who are more likely to know what to do and have expressed a wish to -receive more messages about Emacs than the others. +Sending bug reports to +@url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, +the help-gnu-emacs mailing list} +(which has the effect of posting on @uref{news:gnu.emacs.help}) is +undesirable because it takes the time of an unnecessarily large group +of people, most of whom are just users and have no idea how to fix +these problem. +@url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, The +bug-gnu-emacs list} reaches a much smaller group of people who are +more likely to know what to do and have expressed a wish to receive +more messages about Emacs than the others. @end quotation RMS says it is sometimes fine to post to @uref{news:gnu.emacs.help}: @@ -960,7 +964,8 @@ Editor and COrrector) under ITS (the Incompatible Timesharing System) on a PDP-10. RMS had already extended TECO with a ``real-time'' full-screen mode with reprogrammable keys. Emacs was started by -@email{gls@@east.sun.com, Guy Steele} as a project to unify the many +@c gls@@east.sun.com +Guy Steele as a project to unify the many divergent TECO command sets and key bindings at MIT, and completed by RMS. @@ -1340,7 +1345,9 @@ In general, new Emacs users should not be provided with @file{.emacs} files, because this can cause confusing non-standard behavior. Then -they send questions to @email{help-gnu-emacs@@gnu.org} asking why Emacs +they send questions to +@url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, +the help-gnu-emacs mailing list} asking why Emacs isn't behaving as documented. Emacs includes the Customize facility (@pxref{Using Customize}). This @@ -1805,7 +1812,8 @@ @cindex @code{gnuserv} There is an alternative version of @samp{emacsclient} called -@samp{gnuserv}, written by @email{ange@@hplb.hpl.hp.com, Andy Norman} +@c ange@@hplb.hpl.hp.com +@samp{gnuserv}, written by Andy Norman (@pxref{Packages that do not come with Emacs}). @samp{gnuserv} uses Internet domain sockets, so it can work across most network connections. @@ -1973,7 +1981,8 @@ @cindex Visible bell @cindex Bell, visible -@email{martin@@cc.gatech.edu, Martin R. Frank} writes: +@c martin@@cc.gatech.edu +Martin R. Frank writes: Tell Emacs to use the @dfn{visible bell} instead of the audible bell, and set the visible bell to nothing. @@ -3304,7 +3313,7 @@ wish, Emacs can download and automatically install it for you. @uref{http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.html, The Emacs Lisp -List (ELL)}, maintained by @email{S.J.Eglen@@damtp.cam.ac.uk, Stephen Eglen}, +List (ELL)}, maintained by Stephen Eglen, aims to provide one compact list with links to all of the current Emacs Lisp files on the Internet. The ELL can be browsed over the web, or from Emacs with @uref{http://www.damtp.cam.ac.uk/user/sje30/emacs/ell.el, @@ -4313,7 +4322,8 @@ @cindex Sender, replying only to @cindex Rmail, replying to the sender of a message in -@email{isaacson@@seas.upenn.edu, Ron Isaacson} says: When you hit +@c isaacson@@seas.upenn.edu +Ron Isaacson says: When you hit @key{r} to reply in Rmail, by default it CCs all of the original recipients (everyone on the original @samp{To} and @samp{CC} lists). With a prefix argument (i.e., typing @kbd{C-u} before @key{r}), === modified file 'doc/misc/pcl-cvs.texi' --- doc/misc/pcl-cvs.texi 2013-01-05 21:18:01 +0000 +++ doc/misc/pcl-cvs.texi 2013-07-25 07:10:56 +0000 @@ -172,17 +172,20 @@ PCL-CVS as well as all the documentation. @item -@email{inge@@lysator.liu.se, Inge Wallin} wrote the skeleton of +@c inge@@lysator.liu.se +Inge Wallin wrote the skeleton of @file{pcl-cvs.texi}, and gave useful comments on it. He also wrote the files @file{elib-node.el} and @file{compile-all.el}. The file @file{cookie.el} was inspired by Inge.@refill @item -@email{linus@@lysator.liu.se, Linus Tolke} contributed useful comments +@c linus@@lysator.liu.se +Linus Tolke contributed useful comments on both the functionality and the documentation.@refill @item -@email{jwz@@jwz.com, Jamie Zawinski} contributed +@c jwz@@jwz.com +Jamie Zawinski contributed @file{pcl-cvs-lucid.el}, which was later renamed to @file{pcl-cvs-xemacs.el}.@refill @@ -191,34 +194,40 @@ remote CVS support). @item -@email{jimb@@cyclic.com, Jim Blandy} contributed hooks to automatically +@c jimb@@cyclic.com +Jim Blandy contributed hooks to automatically guess CVS log entries from @file{ChangeLog} contents, and initial support of the new Cygnus / Cyclic remote CVS, as well as various sundry bug fixes and cleanups. @item -@email{kingdon@@cyclic.com, Jim Kingdon} contributed lots of fixes to +@c kingdon@@cyclic.com +Jim Kingdon contributed lots of fixes to the build and installation procedure. @item -@email{woods@@weird.com, Greg A. Woods} contributed code to implement +@c woods@@weird.com +Greg A. Woods contributed code to implement the use of per-file diff buffers, and vendor join diffs with emerge and ediff, as well as various and sundry bug fixes and cleanups. @item -@email{greg.klanderman@@alum.mit.edu, Greg Klanderman} implemented +@c greg.klanderman@@alum.mit.edu +Greg Klanderman implemented toggling of marked files, setting of CVS command flags via prefix arguments, updated the XEmacs support, updated the manual, and fixed numerous bugs. @item -@email{monnier@@gnu.org, Stefan Monnier} added a slew of other +@c monnier@@gnu.org +Stefan Monnier added a slew of other features and introduced even more new bugs. If there's any bug left, you can be sure it's his. @item @c wordy to avoid an underfull hbox -@email{masata-y@@is.aist-nara.ac.jp, Masatake YAMATO} made a gracious +@c masata-y@@is.aist-nara.ac.jp +Masatake YAMATO made a gracious contribution of his cvstree code to display a tree of tags which was later superseded by the new @code{cvs-status-mode}. @end itemize @@ -1369,18 +1378,19 @@ @cindex FAQ @cindex Problems, list of common -If you find a bug or misfeature, don't hesitate to tell us! Send email -to @email{bug-gnu-emacs@@gnu.org} which is gatewayed to the newsgroup -@samp{gnu.emacs.bugs}. Feature requests should also be sent there. We -prefer discussing one thing at a time. If you find several unrelated +If you find a bug or misfeature, don't hesitate to tell us! +Use @kbd{M-x report-emacs-bug} to send us a report. +You can follow the same process for feature requests. +We prefer discussing one thing at a time. If you find several unrelated bugs, please report them separately. If you are running PCL-CVS under XEmacs, you should also send a copy of bug reports to -@email{xemacs-beta@@xemacs.org}. +the @url{http://lists.xemacs.org/mailman/listinfo/xemacs-beta, +XEmacs mailing list}. If you have problems using PCL-CVS or other questions, send them to -@email{help-gnu-emacs@@gnu.org}, which is gatewayed to the -@samp{gnu.emacs.help} newsgroup. This is a good place to get help, as -is @email{cvs-info@@gnu.org}, gatewayed to @samp{gnu.cvs.help}. +the @url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, +help-gnu-emacs mailing list}. This is a good place to get help, as is +the @url{http://lists.nongnu.org/mailman/listinfo/info-cvs, info-cvs list}. If you have ideas for improvements, or if you have written some extensions to this package, we would like to hear from you. We hope that === modified file 'doc/misc/reftex.texi' --- doc/misc/reftex.texi 2013-02-13 04:31:09 +0000 +++ doc/misc/reftex.texi 2013-07-25 07:10:56 +0000 @@ -3639,8 +3639,8 @@ @cindex @code{http}, @RefTeX{} home page @cindex @code{ftp}, @RefTeX{} site -@RefTeX{} was written by @i{Carsten Dominik} -@email{dominik@@science.uva.nl}, with contributions by @i{Stephen +@c dominik@@science.uva.nl +@RefTeX{} was written by @i{Carsten Dominik}, with contributions by @i{Stephen Eglen}. @RefTeX{} is currently maintained by @value{MAINTAINER}, see the @value{MAINTAINERSITE} for detailed information. === modified file 'doc/misc/ses.texi' --- doc/misc/ses.texi 2013-03-04 08:45:03 +0000 +++ doc/misc/ses.texi 2013-07-25 07:10:56 +0000 @@ -60,7 +60,7 @@ @end display @end ifnottex -To report bugs, send email to @email{jyavner@@member.fsf.org}. +To report bugs, use @kbd{M-x report-emacs-bug}. @insertcopying @@ -997,39 +997,62 @@ Coding by: @quotation -Jonathan Yavner @email{jyavner@@member.fsf.org}@* -Stefan Monnier @email{monnier@@gnu.org}@* -Shigeru Fukaya @email{shigeru.fukaya@@gmail.com} +@c jyavner@@member.fsf.org +Jonathan Yavner, +@c monnier@@gnu.org +Stefan Monnier, +@c shigeru.fukaya@@gmail.com +Shigeru Fukaya @end quotation @noindent Texinfo manual by: @quotation -Jonathan Yavner @email{jyavner@@member.fsf.org}@* -Brad Collins +@c jyavner@@member.fsf.org +Jonathan Yavner, +@c brad@@chenla.org +Brad Collins @end quotation @noindent Ideas from: @quotation -Christoph Conrad @email{christoph.conrad@@gmx.de}@* -CyberBob @email{cyberbob@@redneck.gacracker.org}@* -Syver Enstad @email{syver-en@@online.no}@* -Ami Fischman @email{fischman@@zion.bpnetworks.com}@* -Thomas Gehrlein @email{Thomas.Gehrlein@@t-online.de}@* -Chris F.A. Johnson @email{c.f.a.johnson@@rogers.com}@* -Yusong Li @email{lyusong@@hotmail.com}@* -Juri Linkov @email{juri@@jurta.org}@* -Harald Maier @email{maierh@@myself.com}@* -Alan Nash @email{anash@@san.rr.com}@* -François Pinard @email{pinard@@iro.umontreal.ca}@* -Pedro Pinto @email{ppinto@@cs.cmu.edu}@* -Stefan Reichör @email{xsteve@@riic.at}@* -Oliver Scholz @email{epameinondas@@gmx.de}@* -Richard M. Stallman @email{rms@@gnu.org}@* -Luc Teirlinck @email{teirllm@@dms.auburn.edu}@* -J. Otto Tennant @email{jotto@@pobox.com}@* -Jean-Philippe Theberge @email{jphil@@acs.pagesjaunes.fr} +@c christoph.conrad@@gmx.de +Christoph Conrad, +@c cyberbob@@redneck.gacracker.org +CyberBob, +@c syver-en@@online.no +Syver Enstad, +@c fischman@@zion.bpnetworks.com +Ami Fischman, +@c Thomas.Gehrlein@@t-online.de +Thomas Gehrlein, +@c c.f.a.johnson@@rogers.com +Chris F.A. Johnson, +@c lyusong@@hotmail.com +Yusong Li, +@c juri@@jurta.org +Juri Linkov, +@c maierh@@myself.com +Harald Maier, +@c anash@@san.rr.com +Alan Nash, +@c pinard@@iro.umontreal.ca +François Pinard, +@c ppinto@@cs.cmu.edu +Pedro Pinto, +@c xsteve@@riic.at +Stefan Reichör, +@c epameinondas@@gmx.de +Oliver Scholz, +@c rms@@gnu.org +Richard M. Stallman, +@c teirllm@@dms.auburn.edu +Luc Teirlinck, +@c jotto@@pobox.com +J. Otto Tennant, +@c jphil@@acs.pagesjaunes.fr +Jean-Philippe Theberge @end quotation @c =================================================================== === modified file 'doc/misc/woman.texi' --- doc/misc/woman.texi 2013-02-13 04:31:09 +0000 +++ doc/misc/woman.texi 2013-07-25 07:10:56 +0000 @@ -105,10 +105,7 @@ Microsoft Windows, but has also been tested on MS-DOS, and various versions of UNIX and GNU/Linux. -WoMan is distributed with GNU Emacs. In addition, the current source -code and documentation files are available from -@uref{http://centaur.maths.qmw.ac.uk/Emacs/WoMan/, the WoMan web -server}. +WoMan is distributed with GNU Emacs. WoMan implements a subset of the formatting performed by the Emacs @code{man} (or @code{manual-entry}) command to format a Unix-style @@ -148,11 +145,7 @@ either running the command @code{woman-mini-help} or selecting the WoMan menu option @samp{Mini Help}. -WoMan is (of course) still under development! Please -@email{F.J.Wright@@qmw.ac.uk, let me know} what doesn't work---I am -adding and improving functionality as testing shows that it is -necessary. Guidance on reporting bugs is given below. @xref{Bugs, , -Reporting Bugs}. +Guidance on reporting bugs is given below. @xref{Bugs, , Reporting Bugs}. @c =================================================================== @@ -276,6 +269,7 @@ and man can happily co-exist, which is very useful for comparison and debugging purposes. +@ignore @code{nroff} simulates non-@acronym{ASCII} characters by using one or more @acronym{ASCII} characters. WoMan should be able to do much better than this. I have recently begun to add support for WoMan to use more of the @@ -284,6 +278,7 @@ be possible to move WoMan from an emulation of @code{nroff} to an emulation of @code{troff} as GNU Emacs moves to providing bit-mapped display facilities. +@end ignore @node Finding @chapter Finding and Formatting Man Pages @@ -1290,8 +1285,8 @@ on @uref{http://savannah.gnu.org/projects/emacs/}. If it still fails, please @item -send a bug report to @email{bug-gnu-emacs@@gnu.org} and to -@email{F.J.Wright@@qmw.ac.uk}. Please include the entry from the +use @kbd{M-x report-emacs-bug} to send a bug report. +Please include the entry from the @code{*WoMan-Log*} buffer relating to the problem file, together with a brief description of the problem. Please indicate where you got the man source file from, but do not send it unless asked to send it. @@ -1310,43 +1305,80 @@ fragments, general interest, etc.: @quotation -Jari Aalto, @email{jari.aalto@@cs.tpu.fi}@* -Dean Andrews, @email{dean@@dra.com}@* -Juanma Barranquero, @email{barranquero@@laley-actualidad.es}@* -Karl Berry, @email{kb@@cs.umb.edu}@* -Jim Chapman, @email{jchapman@@netcomuk.co.uk}@* -Frederic Corne, @email{frederic.corne@@erli.fr}@* -Peter Craft, @email{craft@@alacritech.com}@* -Charles Curley, @email{ccurley@@trib.com}@* -Jim Davidson, @email{jdavidso@@teknowledge.com}@* -Kevin D'Elia, @email{Kevin.DElia@@mci.com}@* -John Fitch, @email{jpff@@maths.bath.ac.uk}@* -Hans Frosch, @email{jwfrosch@@rish.b17c.ingr.com}@* -Guy Gascoigne-Piggford, @email{ggp@@informix.com}@* -Brian Gorka, @email{gorkab@@sanchez.com}@* -Nicolai Henriksen, @email{nhe@@lyngso-industri.dk}@* -Thomas Herchenroeder, @email{the@@software-ag.de}@* -Alexander Hinds, @email{ahinds@@thegrid.net}@* -Stefan Hornburg, @email{sth@@hacon.de}@* -Theodore Jump, @email{tjump@@cais.com}@* -Paul Kinnucan, @email{paulk@@mathworks.com}@* -Jonas Linde, @email{jonas@@init.se}@* -Andrew McRae, @email{andrewm@@optimation.co.nz}@* -Howard Melman, @email{howard@@silverstream.com}@* -Dennis Pixton, @email{dennis@@math.binghamton.edu}@* -T. V. Raman, @email{raman@@Adobe.com}@* -Bruce Ravel, @email{bruce.ravel@@nist.gov}@* -Benjamin Riefenstahl, @email{benny@@crocodial.de}@* -Kevin Ruland, @email{kruland@@seistl.com}@* -Tom Schutter, @email{tom@@platte.com}@* -Wei-Xue Shi, @email{wxshi@@ma.neweb.ne.jp}@* -Fabio Somenzi, @email{fabio@@joplin.colorado.edu}@* -Karel Sprenger, @email{ks@@ic.uva.nl}@* -Chris Szurgot, @email{szurgot@@itribe.net}@* -Paul A. Thompson, @email{pat@@po.cwru.edu}@* -Arrigo Triulzi, @email{arrigo@@maths.qmw.ac.uk}@* -Geoff Voelker, @email{voelker@@cs.washington.edu}@* -Eli Zaretskii, @email{eliz@@is.elta.co.il} +@c jari.aalto@@cs.tpu.fi +Jari Aalto, +@c dean@@dra.com +Dean Andrews, +@c barranquero@@laley-actualidad.es +Juanma Barranquero, +@c kb@@cs.umb.edu +Karl Berry, +@c jchapman@@netcomuk.co.uk +Jim Chapman, +@c frederic.corne@@erli.fr +Frederic Corne, +@c craft@@alacritech.com +Peter Craft, +@c ccurley@@trib.com +Charles Curley, +@c jdavidso@@teknowledge.com +Jim Davidson, +@c Kevin.DElia@@mci.com +Kevin D'Elia, +@c jpff@@maths.bath.ac.uk +John Fitch, +@c jwfrosch@@rish.b17c.ingr.com +Hans Frosch, +@c ggp@@informix.com +Guy Gascoigne-Piggford, +@c gorkab@@sanchez.com +Brian Gorka, +@c nhe@@lyngso-industri.dk +Nicolai Henriksen, +@c the@@software-ag.de +Thomas Herchenroeder, +@c ahinds@@thegrid.net +Alexander Hinds, +@c sth@@hacon.de +Stefan Hornburg, +@c tjump@@cais.com +Theodore Jump, +@c paulk@@mathworks.com +Paul Kinnucan, +@c jonas@@init.se +Jonas Linde, +@c andrewm@@optimation.co.nz +Andrew McRae, +@c howard@@silverstream.com +Howard Melman, +@c dennis@@math.binghamton.edu +Dennis Pixton, +@c raman@@Adobe.com +T. V. Raman, +@c bruce.ravel@@nist.gov +Bruce Ravel, +@c benny@@crocodial.de +Benjamin Riefenstahl, +@c kruland@@seistl.com +Kevin Ruland, +@c tom@@platte.com +Tom Schutter, +@c wxshi@@ma.neweb.ne.jp +Wei-Xue Shi, +@c fabio@@joplin.colorado.edu +Fabio Somenzi, +@c ks@@ic.uva.nl +Karel Sprenger, +@c szurgot@@itribe.net +Chris Szurgot, +@c pat@@po.cwru.edu +Paul A. Thompson, +@c arrigo@@maths.qmw.ac.uk +Arrigo Triulzi, +@c voelker@@cs.washington.edu +Geoff Voelker, +@c eliz@@is.elta.co.il +Eli Zaretskii @end quotation @c =================================================================== === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-25 00:37:56 +0000 +++ lisp/ChangeLog 2013-07-25 07:10:56 +0000 @@ -1,3 +1,7 @@ +2013-07-25 Glenn Morris + + * dired-x.el (dired-mark-extension): Convert comment to doc string. + 2013-07-25 Juanma Barranquero * desktop.el (desktop--make-frame): Do not pass the `fullscreen' === modified file 'lisp/dired-x.el' --- lisp/dired-x.el 2013-07-22 01:04:10 +0000 +++ lisp/dired-x.el 2013-07-25 07:10:56 +0000 @@ -331,9 +331,9 @@ ;; Mark files with some extension. (defun dired-mark-extension (extension &optional marker-char) "Mark all files with a certain EXTENSION for use in later commands. -A `.' is *not* automatically prepended to the string entered." - ;; EXTENSION may also be a list of extensions instead of a single one. - ;; Optional MARKER-CHAR is marker to use. +A `.' is *not* automatically prepended to the string entered. +EXTENSION may also be a list of extensions instead of a single one. +Optional MARKER-CHAR is marker to use." (interactive "sMarking extension: \nP") (or (listp extension) (setq extension (list extension))) ------------------------------------------------------------ revno: 113536 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-07-24 23:57:25 -0700 message: * make-dist: Add a --tests option, to include test/. diff: === modified file 'ChangeLog' --- ChangeLog 2013-07-24 01:03:56 +0000 +++ ChangeLog 2013-07-25 06:57:25 +0000 @@ -1,3 +1,7 @@ +2013-07-25 Glenn Morris + + * make-dist: Add a --tests option, to include test/. + 2013-07-24 Glenn Morris * configure.ac: Use self-descriptive tags for AC_CONFIG_COMMANDS. === modified file 'make-dist' --- make-dist 2013-05-18 12:04:40 +0000 +++ make-dist 2013-07-25 06:57:25 +0000 @@ -1,8 +1,7 @@ #!/bin/sh ### make-dist: create an Emacs distribution tar file from current srcdir -## Copyright (C) 1995, 1997-1998, 2000-2013 Free Software Foundation, -## Inc. +## Copyright (C) 1995, 1997-1998, 2000-2013 Free Software Foundation, Inc. ## This file is part of GNU Emacs. @@ -51,6 +50,7 @@ make_tar=no default_gzip=gzip newer="" +with_tests=no while [ $# -gt 0 ]; do case "$1" in @@ -98,6 +98,12 @@ check=no ;; + ## Include the test/ directory. + ## This option is mainly for the hydra build server. + "--tests") + with_tests=yes + ;; + "--help") echo "Usage: ${progname} [options]" echo "" @@ -110,6 +116,7 @@ echo " --no-update don't recompile or do analogous things" echo " --snapshot same as --clean-up --no-update --tar --no-check" echo " --tar make a tar file" + echo " --tests include the test/ directory" echo "" exit 0 ;; @@ -289,7 +296,7 @@ build-aux build-aux/snippet \ src src/bitmaps lib lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ - `find etc lisp admin -type d` \ + `find etc lisp admin test -type d` \ doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ info m4 msdos \ nextstep nextstep/templates \ @@ -300,6 +307,13 @@ nextstep/GNUstep/Emacs.base \ nextstep/GNUstep/Emacs.base/Resources do + + if [ "$with_tests" != "yes" ]; then + case $subdir in + test*) continue ;; + esac + fi + ## site-lisp for in-place installs (?). [ "$subdir" = "site-lisp" ] || [ -d "$subdir" ] || \ echo "WARNING: $subdir not found, making anyway" @@ -447,6 +461,17 @@ ln $f $tempdir/$f done +if [ "$with_tests" = "yes" ]; then + echo "Making links to \`test' and its subdirectories" + for f in `find test -type f`; do + case $f in + test/automated/flymake/warnpred/a.out) continue ;; + test/automated/Makefile) continue ;; + esac + ln $f $tempdir/$f + done +fi + echo "Making links to \`etc' and its subdirectories" for f in `find etc -type f`; do case $f in ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.