commit f49e3a2603f249bb2ec281f3eaedd80cbaef2243 (HEAD, refs/remotes/origin/master) Author: Eli Zaretskii Date: Sun Sep 27 11:30:35 2015 +0300 ; Mention non-ASCII encoding issues in CONTRIBUTE * CONTRIBUTE: Document recommendations for encoding non-ASCII characters in Emacs sources. diff --git a/CONTRIBUTE b/CONTRIBUTE index 609ab7a..098579e 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -201,6 +201,20 @@ then exclude that commit from the merge to trunk. ** Other process information +*** Non-ASCII characters in Emacs files + +If you introduce non-ASCII characters into Emacs source files, it is a +good idea to add a 'coding' cookie to the file to state its encoding. +Please use the UTF-8 encoding unless it cannot do the job for some +good reason. As of Emacs 24.4, it is no longer necessary to have +explicit 'coding' cookies in *.el files if they are encoded in UTF-8, +but other files need them even if encoded in UTF-8. And even for *.el +files, having an explicit encoding specification facilitates correct +display of non-ASCII characters when the file is visited in older +Emacs versions. + +*** Useful files in the admin/ directory + See all the files in admin/notes/* . In particular, see admin/notes/newfile, see admin/notes/repo. commit 1ac5a9c20cb22efb398fa18781c6b932dd4e54df Author: Simen Heggestøyl Date: Sun Sep 27 10:04:09 2015 +0200 Add prettify-symbols-alist for js-mode * lisp/progmodes/js.el (js--prettify-symbols-alist): New defconst. (js-mode): Use it. diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 6a800f8..ab994f3 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1724,6 +1724,12 @@ This performs fontification according to `js--class-styles'." (js-syntax-propertize-regexp end)))))) (point) end)) +(defconst js--prettify-symbols-alist + '(("=>" . ?⇒) + (">=" . ?≥) + ("<=" . ?≤)) + "Alist of symbol prettifications for JavaScript.") + ;;; Indentation (defconst js--possibly-braceless-keyword-re @@ -3495,6 +3501,7 @@ If one hasn't been set, or if it's stale, prompt for a new one." (setq-local open-paren-in-column-0-is-defun-start nil) (setq-local font-lock-defaults (list js--font-lock-keywords)) (setq-local syntax-propertize-function #'js-syntax-propertize) + (setq-local prettify-symbols-alist js--prettify-symbols-alist) (setq-local parse-sexp-ignore-comments t) (setq-local parse-sexp-lookup-properties t) @@ -3564,4 +3571,8 @@ If one hasn't been set, or if it's stale, prompt for a new one." (provide 'js) +;; Local Variables: +;; coding: utf-8 +;; End: + ;; js.el ends here commit 3fb5fcb1860453826cd97832ed66c01a6b951bfd Author: Eli Zaretskii Date: Sun Sep 27 10:56:30 2015 +0300 ; * CONTRIBUTE: Mention admin/MAINTAINERS. diff --git a/CONTRIBUTE b/CONTRIBUTE index 5821ee5..609ab7a 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -204,6 +204,14 @@ then exclude that commit from the merge to trunk. See all the files in admin/notes/* . In particular, see admin/notes/newfile, see admin/notes/repo. +The file admin/MAINTAINERS records the areas of interest of frequent +Emacs contributors. If you are making changes in one of the files +mentioned there, it is a good idea to consult the person who expressed +an interest in that file, and/or get his/her feedback for the changes. +If you are a frequent contributor and have interest in maintaining +specific files, please record those interests in that file, so that +others could be aware of that. + *** git vs rename Git does not explicitly represent a file renaming; it uses a percent commit 944952a741eec1e9695c7db3b63014ee2da7196f Author: Eli Zaretskii Date: Sun Sep 27 10:50:46 2015 +0300 * nt/subdirs.el: File deleted (no longer used). diff --git a/nt/subdirs.el b/nt/subdirs.el deleted file mode 100644 index ee1c123..0000000 --- a/nt/subdirs.el +++ /dev/null @@ -1,3 +0,0 @@ -;; -*- no-byte-compile: t -*- -(if (fboundp 'normal-top-level-add-subdirs-to-load-path) - (normal-top-level-add-subdirs-to-load-path)) commit 2fbaf3042754532ee67a830c1d7e388a21c95be8 Author: Eli Zaretskii Date: Sun Sep 27 10:48:44 2015 +0300 ; * admin/MAINTAINERS: Minor copyedits diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 80c5f75..da56466 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -155,6 +155,9 @@ Eli Zaretskii Mule admin/unidata/* + admin/nt/dump.bat + + test/etags/* Stefan Monnier src/intervals.c @@ -221,7 +224,6 @@ admin/diff-tar-files admin/find-gc.el admin/gitmerge.el admin/make-emacs -admin/nt/dump.bat admin/quick-install-emacs admin/unidata/blocks.awk etc/edt-user.el @@ -715,7 +717,6 @@ lisp/x-dnd.el lisp/xml.el lisp/xt-mouse.el lwlib/* -nt/subdirs.el oldXMenu/* src/bitmaps/ src/cygw32.c @@ -729,5 +730,9 @@ src/nsselect.m src/nsterm.m test/automated/* test/cedet/* -test/etags/* test/rmailmm.el + + +;;; Local Variables: +;;; coding: utf-8 +;;; End: commit d514ddd638d6123f92db2d916a45d0630783e696 Author: Xue Fuqiao Date: Sun Sep 27 09:25:52 2015 +0800 ; * admin/MAINTAINERS: Add an entry for Xue Fuqiao. diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 4e5aa00..80c5f75 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -203,6 +203,9 @@ Nicolas Petton lisp/emacs-lisp/subr-x.el lisp/arc-mode.el +Xue Fuqiao + doc/lispref/* + ============================================================================== 3. ============================================================================== commit 984c40a90f5d5d6a787cce35f9efed8623e15961 Author: Nicolas Petton Date: Sun Sep 27 01:58:38 2015 +0200 ; * admin/MAINTAINERS: Add entries for Nicolas Petton diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index e71582b..4e5aa00 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -104,6 +104,10 @@ Michael Albinus Simen Heggestøyl lisp/textmodes/css-mode.el +Nicolas Petton + lisp/emacs-lisp/map.el + lisp/emacs-lisp/seq.el + ============================================================================== 2. ============================================================================== @@ -195,6 +199,10 @@ Michael Albinus test/automated/inotify-test.el test/automated/vc-tests.el +Nicolas Petton + lisp/emacs-lisp/subr-x.el + lisp/arc-mode.el + ============================================================================== 3. ============================================================================== @@ -329,7 +337,6 @@ lisp/emacs-lisp/lisp-mode.el lisp/emacs-lisp/lisp.el lisp/emacs-lisp/macroexp.el lisp/emacs-lisp/map-ynp.el -lisp/emacs-lisp/map.el lisp/emacs-lisp/nadvice.el lisp/emacs-lisp/package-x.el lisp/emacs-lisp/pcase.el @@ -339,10 +346,8 @@ lisp/emacs-lisp/regexp-opt.el lisp/emacs-lisp/regi.el lisp/emacs-lisp/ring.el lisp/emacs-lisp/rx.el -lisp/emacs-lisp/seq.el lisp/emacs-lisp/shadow.el lisp/emacs-lisp/smie.el -lisp/emacs-lisp/subr-x.el lisp/emacs-lisp/syntax.el lisp/emacs-lisp/tabulated-list.el lisp/emacs-lisp/tcover-ses.el commit 3d16ffb304f3026e9bcb10a9cf5a76976669b9b1 Author: Alan Mackenzie Date: Sat Sep 26 19:03:35 2015 +0000 Fix follow-scroll-up/down, making them replacements for scroll-up/down. 1. Allow point to move between follow windows in scroll operations. 2. Fix bug where `right-char' just before EOB caused spurious scrolling, when EOB was isolated in the last follow window. lisp/follow.el (follow-fixed-window): New variable. (follow-get-scrolled-point): New function. (follow-scrol-up, follow-scroll-down): Add autoload cookies. Reformulate the code. Put `scroll-command' properties on the functions. Correct minor errors in ...-down's doc string and code. (follow-calc-win-end): Amend incomplete doc string. Use `pos-visible-in-window-p' to check whether EOB is in the window. (follow-estimate-first-window-start): Correct an off-by-1 error. (follow-adjust-window): Add handling for explicit scrolling operations. diff --git a/lisp/follow.el b/lisp/follow.el index d62d557..938c59e 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -347,6 +347,9 @@ Used by `follow-window-size-change'.") (defvar follow-windows-start-end-cache nil "Cache used by `follow-window-start-end'.") +(defvar follow-fixed-window nil + "If non-nil, the current window must not be scrolled. +This is typically set by explicit scrolling commands.") ;;; Debug messages ;; This inline function must be as small as possible! @@ -439,6 +442,54 @@ Keys specific to Follow mode: ;;; Scroll +(defun follow-get-scrolled-point (dest windows) + "Calculate the correct value for point after a scrolling operation. + +DEST is our default position, typically where point was before the scroll. +If `scroll-preserve-screen-position' is non-nil and active, DEST will be +in the same screen position as before the scroll. WINDOWS is the list of +windows in the follow chain. + +This function attempts to duplicate the point placing from +`window_scroll_line_based' in the Emacs core source window.c. + +Return the new position." + (if (and scroll-preserve-screen-position + (get this-command 'scroll-command)) + dest + (let ((dest-column + (save-excursion + (goto-char dest) + (- (current-column) + (progn (vertical-motion 0) (current-column))))) + (limit0 + (with-selected-window (car windows) + (save-excursion + (goto-char (window-start)) + (vertical-motion 0) + (point)))) + (limitn + (with-selected-window (car (reverse windows)) + (save-excursion + (goto-char (window-end nil t)) + (if (pos-visible-in-window-p) + (point) ; i.e. (point-max) + (1- (point))))))) + (cond + ((< dest limit0) + (with-selected-window (car windows) + (save-excursion + (goto-char limit0) + (vertical-motion (cons dest-column 0)) + (point)))) + ((> dest limitn) + (with-selected-window (car (reverse windows)) + (save-excursion + (goto-char limitn) + (vertical-motion (cons dest-column 0)) + (point)))) + (t dest))))) + ;; `scroll-up' and `-down', but for windows in Follow mode. ;; ;; Almost like the real thing, except when the cursor ends up outside @@ -454,6 +505,7 @@ Keys specific to Follow mode: ;; position... (This would also be corrected if we would have had a ;; good redisplay abstraction.) +;;;###autoload (defun follow-scroll-up (&optional arg) "Scroll text in a Follow mode window chain up. @@ -467,22 +519,26 @@ Works like `scroll-up' when not in Follow mode." (interactive "P") (cond ((not follow-mode) (scroll-up arg)) - (arg - (save-excursion (scroll-up arg)) - (setq follow-internal-force-redisplay t)) + ((eq arg '-) + (follow-scroll-down)) (t - (let* ((windows (follow-all-followers)) - (end (window-end (car (reverse windows))))) - (if (eq end (point-max)) - (signal 'end-of-buffer nil) - (select-window (car windows)) - ;; `window-end' might return nil. - (if end - (goto-char end)) - (vertical-motion (- next-screen-context-lines)) - (set-window-start (car windows) (point))))))) - + (let ((opoint (point)) (owin (selected-window))) + (while + ;; If we are too near EOB, try scrolling the previous window. + (condition-case nil (progn (scroll-up arg) nil) + (end-of-buffer + (condition-case nil (progn (follow-previous-window) t) + (error + (select-window owin) + (goto-char opoint) + (signal 'end-of-buffer nil)))))) + (unless (and scroll-preserve-screen-position + (get this-command 'scroll-command)) + (goto-char opoint)) + (setq follow-fixed-window t))))) +(put 'follow-scroll-up 'scroll-command t) +;;;###autoload (defun follow-scroll-down (&optional arg) "Scroll text in a Follow mode window chain down. @@ -492,27 +548,20 @@ the top window in the chain will be visible in the bottom window. If called with an argument, scroll ARG lines down. Negative ARG means scroll upward. -Works like `scroll-up' when not in Follow mode." +Works like `scroll-down' when not in Follow mode." (interactive "P") (cond ((not follow-mode) - (scroll-up arg)) - (arg - (save-excursion (scroll-down arg))) + (scroll-down arg)) + ((eq arg '-) + (follow-scroll-up)) (t - (let* ((windows (follow-all-followers)) - (win (car (reverse windows))) - (start (window-start (car windows)))) - (if (eq start (point-min)) - (signal 'beginning-of-buffer nil) - (select-window win) - (goto-char start) - (vertical-motion (- (- (window-height win) - (if header-line-format 2 1) - next-screen-context-lines))) - (set-window-start win (point)) - (goto-char start) - (vertical-motion (- next-screen-context-lines 1)) - (setq follow-internal-force-redisplay t)))))) + (let ((opoint (point))) + (scroll-down arg) + (unless (and scroll-preserve-screen-position + (get this-command 'scroll-command)) + (goto-char opoint)) + (setq follow-fixed-window t))))) +(put 'follow-scroll-down 'scroll-command t) (declare-function comint-adjust-point "comint" (window)) (defvar comint-scroll-show-maximum-output) @@ -766,15 +815,16 @@ from the selected window." Return (END-POS END-OF-BUFFER). Actually, the position returned is the start of the line after -the last fully-visible line in WIN. If WIN is nil, the selected -window is used." +the last fully-visible line in WIN. END-OF-BUFFER is t when EOB +is fully-visible in WIN. If WIN is nil, the selected window is +used." (let* ((win (or win (selected-window))) (edges (window-inside-pixel-edges win)) (ht (- (nth 3 edges) (nth 1 edges))) (last-line-pos (posn-point (posn-at-x-y 0 (1- ht) win)))) (if (pos-visible-in-window-p last-line-pos win) (let ((end (window-end win t))) - (list end (= end (point-max)))) + (list end (pos-visible-in-window-p (point-max) win))) (list last-line-pos nil)))) (defun follow-calc-win-start (windows pos win) @@ -1008,7 +1058,7 @@ should be a member of WINDOWS, starts at position START." (goto-char start) (vertical-motion 0 win) (dolist (w windows-before) - (vertical-motion (- 1 (window-text-height w)) w)) + (vertical-motion (- (window-text-height w)) w)) (point)))) @@ -1130,138 +1180,144 @@ non-first windows in Follow mode." (cl-assert (eq (window-buffer win) (current-buffer))) (when (and follow-mode (not (window-minibuffer-p win))) - (let* ((dest (point)) - (windows (follow-all-followers win)) - (win-start-end (progn - (follow-update-window-start (car windows)) - (follow-windows-start-end windows))) - (aligned (follow-windows-aligned-p win-start-end)) - (visible (follow-pos-visible dest win win-start-end)) - selected-window-up-to-date) - (unless (and aligned visible) - (setq follow-windows-start-end-cache nil)) - - ;; Select a window to display point. - (unless follow-internal-force-redisplay - (if (eq dest (point-max)) - ;; Be careful at point-max: the display can be aligned - ;; while DEST can be visible in several windows. - (cond - ;; Select the current window, but only when the display - ;; is correct. (When inserting characters in a tail - ;; window, the display is not correct, as they are - ;; shown twice.) - ;; - ;; Never stick to the current window after a deletion. - ;; Otherwise, when typing `DEL' in a window showing - ;; only the end of the file, a character would be - ;; removed from the window above, which is very - ;; unintuitive. - ((and visible - aligned - (not (memq this-command - '(backward-delete-char - delete-backward-char - backward-delete-char-untabify - kill-region)))) - (follow-debug-message "Max: same")) - ;; If the end is visible, and the window doesn't - ;; seems like it just has been moved, select it. - ((follow-select-if-end-visible win-start-end) - (follow-debug-message "Max: end visible") - (setq visible t aligned nil) - (goto-char dest)) - ;; Just show the end... - (t - (follow-debug-message "Max: default") - (select-window (car (last windows))) - (goto-char dest) - (setq visible nil aligned nil))) - - ;; We're not at the end, here life is much simpler. - (cond - ;; This is the normal case! - ;; It should be optimized for speed. - ((and visible aligned) - (follow-debug-message "same")) - ;; Pick a position in any window. If the display is ok, - ;; this picks the `correct' window. - ((follow-select-if-visible dest win-start-end) - (follow-debug-message "visible") - (goto-char dest) - ;; Perform redisplay, in case line is partially visible. - (setq visible nil)) - ;; Not visible anywhere else, lets pick this one. - (visible - (follow-debug-message "visible in selected.")) - ;; If DEST is before the first window start, select the - ;; first window. - ((< dest (nth 1 (car win-start-end))) - (follow-debug-message "before first") - (select-window (car windows)) - (goto-char dest) - (setq visible nil aligned nil)) - ;; If we can position the cursor without moving the first - ;; window, do it. This is the case that catches `RET' at - ;; the bottom of a window. - ((follow-select-if-visible-from-first dest windows) - (follow-debug-message "Below first") - (setq visible t aligned t)) - ;; None of the above. Stick to the selected window. - (t - (follow-debug-message "None") - (setq visible nil aligned nil)))) - - ;; If a new window was selected, make sure that the old is - ;; not scrolled when point is outside the window. - (unless (eq win (selected-window)) - (let ((p (window-point win))) - (set-window-start win (window-start win) nil) - (set-window-point win p)))) - - (unless visible - ;; If point may not be visible in the selected window, - ;; perform a redisplay; this ensures scrolling. - (let ((opoint (point))) - (redisplay) - ;; If this `redisplay' moved point, we got clobbered by a - ;; previous call to `set-window-start'. Try again. - (when (/= (point) opoint) - (goto-char opoint) - (redisplay))) - - (setq selected-window-up-to-date t) - (follow-avoid-tail-recenter) - (setq win-start-end (follow-windows-start-end windows) - follow-windows-start-end-cache nil - aligned nil)) - - ;; Now redraw the windows around the selected window. - (unless (and (not follow-internal-force-redisplay) - (or aligned - (follow-windows-aligned-p win-start-end)) - (follow-point-visible-all-windows-p win-start-end)) - (setq follow-internal-force-redisplay nil) - (follow-redisplay windows (selected-window) - selected-window-up-to-date) - (setq win-start-end (follow-windows-start-end windows) - follow-windows-start-end-cache nil) - ;; Point can end up in another window when DEST is at - ;; the beginning of the buffer and the selected window is - ;; not the first. It can also happen when long lines are - ;; used and there is a big difference between the width of - ;; the windows. (When scrolling one line in a wide window - ;; which will cause a move larger that an entire small - ;; window.) - (unless (follow-pos-visible dest win win-start-end) - (follow-select-if-visible dest win-start-end) - (goto-char dest))) - - ;; If the region is visible, make it look good when spanning - ;; multiple windows. - (when (region-active-p) - (follow-maximize-region - (selected-window) windows win-start-end))) + (let ((windows (follow-all-followers win))) + ;; If we've explicitly scrolled, align the windows first. + (when follow-fixed-window + (follow-debug-message "fixed") + (follow-redisplay windows win) + (goto-char (follow-get-scrolled-point (point) windows)) + (setq follow-fixed-window nil)) + (let* ((dest (point)) + (win-start-end (progn + (follow-update-window-start (car windows)) + (follow-windows-start-end windows))) + (aligned (follow-windows-aligned-p win-start-end)) + (visible (follow-pos-visible dest win win-start-end)) + selected-window-up-to-date) + (unless (and aligned visible) + (setq follow-windows-start-end-cache nil)) + + ;; Select a window to display point. + (unless follow-internal-force-redisplay + (if (eq dest (point-max)) + ;; Be careful at point-max: the display can be aligned + ;; while DEST can be visible in several windows. + (cond + ;; Select the current window, but only when the display + ;; is correct. (When inserting characters in a tail + ;; window, the display is not correct, as they are + ;; shown twice.) + ;; + ;; Never stick to the current window after a deletion. + ;; Otherwise, when typing `DEL' in a window showing + ;; only the end of the file, a character would be + ;; removed from the window above, which is very + ;; unintuitive. + ((and visible + aligned + (not (memq this-command + '(backward-delete-char + delete-backward-char + backward-delete-char-untabify + kill-region)))) + (follow-debug-message "Max: same")) + ;; If the end is visible, and the window doesn't + ;; seems like it just has been moved, select it. + ((follow-select-if-end-visible win-start-end) + (follow-debug-message "Max: end visible") + (setq visible t aligned nil) + (goto-char dest)) + ;; Just show the end... + (t + (follow-debug-message "Max: default") + (select-window (car (last windows))) + (goto-char dest) + (setq visible nil aligned nil))) + + ;; We're not at the end, here life is much simpler. + (cond + ;; This is the normal case! + ;; It should be optimized for speed. + ((and visible aligned) + (follow-debug-message "same")) + ;; Pick a position in any window. If the display is ok, + ;; this picks the `correct' window. + ((follow-select-if-visible dest win-start-end) + (follow-debug-message "visible") + (goto-char dest) + ;; Perform redisplay, in case line is partially visible. + (setq visible nil)) + ;; Not visible anywhere else, lets pick this one. + (visible + (follow-debug-message "visible in selected.")) + ;; If DEST is before the first window start, select the + ;; first window. + ((< dest (nth 1 (car win-start-end))) + (follow-debug-message "before first") + (select-window (car windows)) + (goto-char dest) + (setq visible nil aligned nil)) + ;; If we can position the cursor without moving the first + ;; window, do it. This is the case that catches `RET' at + ;; the bottom of a window. + ((follow-select-if-visible-from-first dest windows) + (follow-debug-message "Below first") + (setq visible t aligned t)) + ;; None of the above. Stick to the selected window. + (t + (follow-debug-message "None") + (setq visible nil aligned nil)))) + + ;; If a new window was selected, make sure that the old is + ;; not scrolled when point is outside the window. + (unless (eq win (selected-window)) + (let ((p (window-point win))) + (set-window-start win (window-start win) nil) + (set-window-point win p)))) + + (unless visible + ;; If point may not be visible in the selected window, + ;; perform a redisplay; this ensures scrolling. + (let ((opoint (point))) + (redisplay) + ;; If this `redisplay' moved point, we got clobbered by a + ;; previous call to `set-window-start'. Try again. + (when (/= (point) opoint) + (goto-char opoint) + (redisplay))) + + (setq selected-window-up-to-date t) + (follow-avoid-tail-recenter) + (setq win-start-end (follow-windows-start-end windows) + follow-windows-start-end-cache nil + aligned nil)) + + ;; Now redraw the windows around the selected window. + (unless (and (not follow-internal-force-redisplay) + (or aligned + (follow-windows-aligned-p win-start-end)) + (follow-point-visible-all-windows-p win-start-end)) + (setq follow-internal-force-redisplay nil) + (follow-redisplay windows (selected-window) + selected-window-up-to-date) + (setq win-start-end (follow-windows-start-end windows) + follow-windows-start-end-cache nil) + ;; Point can end up in another window when DEST is at + ;; the beginning of the buffer and the selected window is + ;; not the first. It can also happen when long lines are + ;; used and there is a big difference between the width of + ;; the windows. (When scrolling one line in a wide window + ;; which will cause a move larger that an entire small + ;; window.) + (unless (follow-pos-visible dest win win-start-end) + (follow-select-if-visible dest win-start-end) + (goto-char dest))) + + ;; If the region is visible, make it look good when spanning + ;; multiple windows. + (when (region-active-p) + (follow-maximize-region + (selected-window) windows win-start-end)))) ;; Whether or not the buffer was in follow mode, update windows ;; displaying the tail so that Emacs won't recenter them. commit 2e775b43e0b092a958bb3d14347a20372ad2d4aa Author: Simen Heggestøyl Date: Sat Sep 26 20:58:49 2015 +0200 ; * admin/MAINTAINERS: Add entry for Simen Heggestøyl diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 3932084..e71582b 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -101,6 +101,9 @@ Michael Albinus lisp/filenotify.el test/automated/file-notify-tests.el +Simen Heggestøyl + lisp/textmodes/css-mode.el + ============================================================================== 2. ============================================================================== @@ -637,7 +640,6 @@ lisp/textmodes/bib-mode.el lisp/textmodes/bibtex-style.el lisp/textmodes/bibtex.el lisp/textmodes/conf-mode.el -lisp/textmodes/css-mode.el lisp/textmodes/dns-mode.el lisp/textmodes/enriched.el lisp/textmodes/fill.el commit b7001598a5525996ab5fd0a9c8becb21a78921b2 Author: Michael Albinus Date: Sat Sep 26 20:46:53 2015 +0200 ; * admin/MAINTAINERS: Add entries for Michael Albinus diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 953347b..3932084 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -81,6 +81,26 @@ Artur Malabarba lisp/emacs-lisp/let-alist.el lisp/character-fold.el +Michael Albinus + Tramp + lisp/net/tramp*.el + lisp/url/url-tramp.el + doc/misc/tramp*.texi + test/automated/tramp-tests.el + + D-Bus + src/dbusbind.c + lisp/net/dbus.el + lisp/net/secrets.el + lisp/net/zeroconf.el + doc/misc/dbus.texi + test/automated/dbus-tests.el + + File Notifications + src/gfilenotify.c + lisp/filenotify.el + test/automated/file-notify-tests.el + ============================================================================== 2. ============================================================================== @@ -164,6 +184,14 @@ Paul Eggert make-dist src/* (except for *.m, *w32*, bitmaps, files others want to maintain) +Michael Albinus + src/inotify.c + lisp/autorevert.el + lisp/notifications.el + test/automated/auto-revert-tests.el + test/automated/inotify-test.el + test/automated/vc-tests.el + ============================================================================== 3. ============================================================================== @@ -449,7 +477,6 @@ lisp/msb.el lisp/mwheel.el lisp/net/* lisp/newcomment.el -lisp/notifications.el lisp/novice.el lisp/nxml/* lisp/obsolete/* commit 1d94461a15a6ae73c0243a365c1e17f4b5cb5272 Author: Paul Eggert Date: Sat Sep 26 10:00:00 2015 -0700 * admin/MAINTAINERS: Add self, plus list some more files sans maintaners. diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index fe7361c..953347b 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -52,7 +52,7 @@ Stefan Monnier minor-mode/major-mode infrastructure text filling minibuffer completion - lisp/textmodes/outline.el + lisp/outline.el Miles Bader src/xfaces.c @@ -146,82 +146,551 @@ Miles Bader Artur Malabarba lisp/isearch.el +Paul Eggert + .dir-locals.el + .gitattributes + .gitignore + GNUmakefile + Makefile.in + admin/merge-gnulib + admin/merge-pkg-config + admin/update-copyright + autogen.sh + build-aux/* + configure.ac + lib/* + lib-src/* (except for files others want to maintain) + m4/* + make-dist + src/* (except for *.m, *w32*, bitmaps, files others want to maintain) + ============================================================================== 3. ============================================================================== -src/Makefile.in -src/abbrev.c -src/alloc.c -src/alloca.c -src/alloca.s -src/atimer.c +admin/admin.el +admin/authors.el +admin/build-configs +admin/bzrmerge.el +admin/charsets/* +admin/check-doc-strings +admin/cus-test.el +admin/diff-tar-files +admin/find-gc.el +admin/gitmerge.el +admin/make-emacs +admin/nt/dump.bat +admin/quick-install-emacs +admin/unidata/blocks.awk +etc/edt-user.el +etc/forms/forms-d2.el +etc/forms/forms-pass.el +etc/nxml/* +etc/themes/* +leim/* +lisp/abbrev.el +lisp/align.el +lisp/allout-widgets.el +lisp/allout.el +lisp/ansi-color.el +lisp/apropos.el +lisp/array.el +lisp/autoarg.el +lisp/autoinsert.el +lisp/autorevert.el +lisp/avoid.el +lisp/battery.el +lisp/bindings.el +lisp/bookmark.el +lisp/bs.el +lisp/buff-menu.el +lisp/calculator.el +lisp/calendar/* +lisp/case-table.el +lisp/cdl.el +lisp/cedet/* +lisp/chistory.el +lisp/cmuscheme.el +lisp/color.el +lisp/completion.el +lisp/composite.el +lisp/cus-dep.el +lisp/cus-edit.el +lisp/cus-face.el +lisp/cus-start.el +lisp/cus-theme.el +lisp/custom.el +lisp/dabbrev.el +lisp/delim-col.el +lisp/delsel.el +lisp/descr-text.el +lisp/desktop.el +lisp/dframe.el +lisp/dired-aux.el +lisp/dired-x.el +lisp/dired.el +lisp/dirtrack.el +lisp/disp-table.el +lisp/dnd.el +lisp/doc-view.el +lisp/dom.el +lisp/double.el +lisp/dynamic-setting.el +lisp/ebuff-menu.el +lisp/echistory.el +lisp/edmacro.el +lisp/ehelp.el +lisp/elec-pair.el +lisp/electric.el +lisp/elide-head.el +lisp/emacs-lisp/advice.el +lisp/emacs-lisp/autoload.el +lisp/emacs-lisp/avl-tree.el +lisp/emacs-lisp/backquote.el +lisp/emacs-lisp/benchmark.el +lisp/emacs-lisp/bindat.el +lisp/emacs-lisp/byte-opt.el +lisp/emacs-lisp/byte-run.el +lisp/emacs-lisp/bytecomp.el +lisp/emacs-lisp/cconv.el +lisp/emacs-lisp/chart.el +lisp/emacs-lisp/check-declare.el +lisp/emacs-lisp/checkdoc.el +lisp/emacs-lisp/cl-extra.el +lisp/emacs-lisp/cl-generic.el +lisp/emacs-lisp/cl-indent.el +lisp/emacs-lisp/cl-lib.el +lisp/emacs-lisp/cl-macs.el +lisp/emacs-lisp/cl-preloaded.el +lisp/emacs-lisp/cl-seq.el +lisp/emacs-lisp/cl.el +lisp/emacs-lisp/copyright.el +lisp/emacs-lisp/crm.el +lisp/emacs-lisp/cursor-sensor.el +lisp/emacs-lisp/debug.el +lisp/emacs-lisp/derived.el +lisp/emacs-lisp/disass.el +lisp/emacs-lisp/easy-mmode.el +lisp/emacs-lisp/edebug.el +lisp/emacs-lisp/eieio-base.el +lisp/emacs-lisp/eieio-compat.el +lisp/emacs-lisp/eieio-core.el +lisp/emacs-lisp/eieio-custom.el +lisp/emacs-lisp/eieio-datadebug.el +lisp/emacs-lisp/eieio-opt.el +lisp/emacs-lisp/eieio-speedbar.el +lisp/emacs-lisp/eieio.el +lisp/emacs-lisp/eldoc.el +lisp/emacs-lisp/elint.el +lisp/emacs-lisp/elp.el +lisp/emacs-lisp/ert-x.el +lisp/emacs-lisp/ert.el +lisp/emacs-lisp/ewoc.el +lisp/emacs-lisp/find-func.el +lisp/emacs-lisp/float-sup.el +lisp/emacs-lisp/generator.el +lisp/emacs-lisp/generic.el +lisp/emacs-lisp/gv.el +lisp/emacs-lisp/helper.el +lisp/emacs-lisp/inline.el +lisp/emacs-lisp/lisp-mnt.el +lisp/emacs-lisp/lisp-mode.el +lisp/emacs-lisp/lisp.el +lisp/emacs-lisp/macroexp.el +lisp/emacs-lisp/map-ynp.el +lisp/emacs-lisp/map.el +lisp/emacs-lisp/nadvice.el +lisp/emacs-lisp/package-x.el +lisp/emacs-lisp/pcase.el +lisp/emacs-lisp/pp.el +lisp/emacs-lisp/re-builder.el +lisp/emacs-lisp/regexp-opt.el +lisp/emacs-lisp/regi.el +lisp/emacs-lisp/ring.el +lisp/emacs-lisp/rx.el +lisp/emacs-lisp/seq.el +lisp/emacs-lisp/shadow.el +lisp/emacs-lisp/smie.el +lisp/emacs-lisp/subr-x.el +lisp/emacs-lisp/syntax.el +lisp/emacs-lisp/tabulated-list.el +lisp/emacs-lisp/tcover-ses.el +lisp/emacs-lisp/tcover-unsafep.el +lisp/emacs-lisp/testcover.el +lisp/emacs-lisp/timer.el +lisp/emacs-lisp/tq.el +lisp/emacs-lisp/trace.el +lisp/emacs-lisp/unsafep.el +lisp/emacs-lisp/warnings.el +lisp/emacs-lock.el +lisp/emulation/* +lisp/env.el +lisp/epa-dired.el +lisp/epa-file.el +lisp/epa-hook.el +lisp/epa-mail.el +lisp/epa.el +lisp/epg-config.el +lisp/epg.el +lisp/eshell/* +lisp/expand.el +lisp/ezimage.el +lisp/face-remap.el +lisp/facemenu.el +lisp/faces.el +lisp/ffap.el +lisp/filecache.el +lisp/files-x.el +lisp/files.el +lisp/filesets.el +lisp/find-cmd.el +lisp/find-dired.el +lisp/find-file.el +lisp/find-lisp.el +lisp/finder.el +lisp/flow-ctrl.el +lisp/foldout.el +lisp/follow.el +lisp/font-core.el +lisp/font-lock.el +lisp/format-spec.el +lisp/format.el +lisp/forms.el +lisp/frame.el +lisp/frameset.el +lisp/fringe.el +lisp/generic-x.el +lisp/gnus/* +lisp/gs.el +lisp/help-at-pt.el +lisp/help-fns.el +lisp/help-macro.el +lisp/help-mode.el +lisp/help.el +lisp/hex-util.el +lisp/hfy-cmap.el +lisp/hi-lock.el +lisp/hilit-chg.el +lisp/hippie-exp.el +lisp/hl-line.el +lisp/htmlfontify.el +lisp/ibuf-ext.el +lisp/ibuf-macs.el +lisp/ibuffer.el +lisp/icomplete.el +lisp/ido.el +lisp/ielm.el +lisp/iimage.el +lisp/image-dired.el +lisp/image-mode.el +lisp/image.el +lisp/imenu.el +lisp/indent.el +lisp/info-look.el +lisp/info-xref.el +lisp/informat.el +lisp/international/* +lisp/isearch.el +lisp/isearchb.el +lisp/jit-lock.el +lisp/jka-cmpr-hook.el +lisp/jka-compr.el +lisp/json.el +lisp/kermit.el +lisp/kmacro.el +lisp/language/* +lisp/leim/* +lisp/linum.el +lisp/loadhist.el +lisp/loadup.el +lisp/locate.el +lisp/lpr.el +lisp/macros.el +lisp/mail/binhex.el +lisp/mail/blessmail.el +lisp/mail/emacsbug.el +lisp/mail/feedmail.el +lisp/mail/footnote.el +lisp/mail/hashcash.el +lisp/mail/mail-extr.el +lisp/mail/mail-hist.el +lisp/mail/mail-utils.el +lisp/mail/mailabbrev.el +lisp/mail/mailalias.el +lisp/mail/mailclient.el +lisp/mail/mailheader.el +lisp/mail/metamail.el +lisp/mail/mspools.el +lisp/mail/reporter.el +lisp/mail/rfc2368.el +lisp/mail/rfc822.el +lisp/mail/sendmail.el +lisp/mail/smtpmail.el +lisp/mail/supercite.el +lisp/mail/uce.el +lisp/mail/undigest.el +lisp/mail/unrmail.el +lisp/mail/uudecode.el +lisp/makesum.el +lisp/man.el +lisp/master.el +lisp/mb-depth.el +lisp/md4.el +lisp/mh-e/* +lisp/midnight.el +lisp/minibuffer.el +lisp/misc.el +lisp/misearch.el +lisp/mouse-copy.el +lisp/mouse-drag.el +lisp/mouse.el +lisp/mpc.el +lisp/msb.el +lisp/mwheel.el +lisp/net/* +lisp/newcomment.el +lisp/notifications.el +lisp/novice.el +lisp/nxml/* +lisp/obsolete/* +lisp/paren.el +lisp/password-cache.el +lisp/pcmpl-cvs.el +lisp/pcmpl-gnu.el +lisp/pcmpl-linux.el +lisp/pcmpl-rpm.el +lisp/pcmpl-unix.el +lisp/pcmpl-x.el +lisp/pcomplete.el +lisp/play/* +lisp/printing.el +lisp/proced.el +lisp/profiler.el +lisp/progmodes/ada-mode.el +lisp/progmodes/ada-prj.el +lisp/progmodes/ada-stmt.el +lisp/progmodes/ada-xref.el +lisp/progmodes/antlr-mode.el +lisp/progmodes/asm-mode.el +lisp/progmodes/autoconf.el +lisp/progmodes/bat-mode.el +lisp/progmodes/bug-reference.el +lisp/progmodes/cc-align.el +lisp/progmodes/cc-awk.el +lisp/progmodes/cc-bytecomp.el +lisp/progmodes/cc-cmds.el +lisp/progmodes/cc-defs.el +lisp/progmodes/cc-engine.el +lisp/progmodes/cc-fonts.el +lisp/progmodes/cc-guess.el +lisp/progmodes/cc-langs.el +lisp/progmodes/cc-menus.el +lisp/progmodes/cc-mode.el +lisp/progmodes/cc-styles.el +lisp/progmodes/cc-vars.el +lisp/progmodes/cfengine.el +lisp/progmodes/cmacexp.el +lisp/progmodes/compile.el +lisp/progmodes/cperl-mode.el +lisp/progmodes/cpp.el +lisp/progmodes/cwarn.el +lisp/progmodes/dcl-mode.el +lisp/progmodes/ebnf-abn.el +lisp/progmodes/ebnf-bnf.el +lisp/progmodes/ebnf-dtd.el +lisp/progmodes/ebnf-ebx.el +lisp/progmodes/ebnf-iso.el +lisp/progmodes/ebnf-otz.el +lisp/progmodes/ebnf-yac.el +lisp/progmodes/ebnf2ps.el +lisp/progmodes/ebrowse.el +lisp/progmodes/elisp-mode.el +lisp/progmodes/etags.el +lisp/progmodes/executable.el +lisp/progmodes/f90.el +lisp/progmodes/flymake.el +lisp/progmodes/fortran.el +lisp/progmodes/glasses.el +lisp/progmodes/grep.el +lisp/progmodes/gud.el +lisp/progmodes/hideif.el +lisp/progmodes/hideshow.el +lisp/progmodes/icon.el +lisp/progmodes/idlw-complete-structtag.el +lisp/progmodes/idlw-help.el +lisp/progmodes/idlw-shell.el +lisp/progmodes/idlw-toolbar.el +lisp/progmodes/idlwave.el +lisp/progmodes/inf-lisp.el +lisp/progmodes/js.el +lisp/progmodes/ld-script.el +lisp/progmodes/m4-mode.el +lisp/progmodes/make-mode.el +lisp/progmodes/mantemp.el +lisp/progmodes/meta-mode.el +lisp/progmodes/mixal-mode.el +lisp/progmodes/modula2.el +lisp/progmodes/octave.el +lisp/progmodes/opascal.el +lisp/progmodes/pascal.el +lisp/progmodes/prog-mode.el +lisp/progmodes/project.el +lisp/progmodes/prolog.el +lisp/progmodes/ps-mode.el +lisp/progmodes/python.el +lisp/progmodes/ruby-mode.el +lisp/progmodes/scheme.el +lisp/progmodes/sh-script.el +lisp/progmodes/simula.el +lisp/progmodes/sql.el +lisp/progmodes/subword.el +lisp/progmodes/vera-mode.el +lisp/progmodes/verilog-mode.el +lisp/progmodes/vhdl-mode.el +lisp/progmodes/which-func.el +lisp/progmodes/xref.el +lisp/progmodes/xscheme.el +lisp/ps-bdf.el +lisp/ps-def.el +lisp/ps-mule.el +lisp/ps-print.el +lisp/ps-samp.el +lisp/recentf.el +lisp/rect.el +lisp/register.el +lisp/repeat.el +lisp/replace.el +lisp/reposition.el +lisp/reveal.el +lisp/rot13.el +lisp/ruler-mode.el +lisp/savehist.el +lisp/saveplace.el +lisp/sb-image.el +lisp/scroll-all.el +lisp/scroll-bar.el +lisp/scroll-lock.el +lisp/select.el +lisp/server.el +lisp/ses.el +lisp/shadowfile.el +lisp/simple.el +lisp/skeleton.el +lisp/sort.el +lisp/soundex.el +lisp/speedbar.el +lisp/strokes.el +lisp/subr.el +lisp/t-mouse.el +lisp/tabify.el +lisp/talk.el +lisp/tar-mode.el +lisp/tempo.el +lisp/term.el +lisp/term/AT386.el +lisp/term/bobcat.el +lisp/term/common-win.el +lisp/term/cygwin.el +lisp/term/iris-ansi.el +lisp/term/linux.el +lisp/term/lk201.el +lisp/term/news.el +lisp/term/ns-win.el +lisp/term/rxvt.el +lisp/term/screen.el +lisp/term/sun.el +lisp/term/tvi970.el +lisp/term/vt100.el +lisp/term/vt200.el +lisp/term/wyse50.el +lisp/term/x-win.el +lisp/term/xterm.el +lisp/textmodes/artist.el +lisp/textmodes/bib-mode.el +lisp/textmodes/bibtex-style.el +lisp/textmodes/bibtex.el +lisp/textmodes/conf-mode.el +lisp/textmodes/css-mode.el +lisp/textmodes/dns-mode.el +lisp/textmodes/enriched.el +lisp/textmodes/fill.el +lisp/textmodes/makeinfo.el +lisp/textmodes/nroff-mode.el +lisp/textmodes/page-ext.el +lisp/textmodes/page.el +lisp/textmodes/paragraphs.el +lisp/textmodes/picture.el +lisp/textmodes/po.el +lisp/textmodes/refbib.el +lisp/textmodes/refer.el +lisp/textmodes/reftex-auc.el +lisp/textmodes/reftex-cite.el +lisp/textmodes/reftex-dcr.el +lisp/textmodes/reftex-global.el +lisp/textmodes/reftex-index.el +lisp/textmodes/reftex-parse.el +lisp/textmodes/reftex-ref.el +lisp/textmodes/reftex-sel.el +lisp/textmodes/reftex-toc.el +lisp/textmodes/reftex-vars.el +lisp/textmodes/reftex.el +lisp/textmodes/remember.el +lisp/textmodes/rst.el +lisp/textmodes/sgml-mode.el +lisp/textmodes/table.el +lisp/textmodes/texinfmt.el +lisp/textmodes/texinfo.el +lisp/textmodes/texnfo-upd.el +lisp/textmodes/text-mode.el +lisp/textmodes/tildify.el +lisp/textmodes/two-column.el +lisp/textmodes/underline.el +lisp/thingatpt.el +lisp/thumbs.el +lisp/time-stamp.el +lisp/time.el +lisp/timezone.el +lisp/tmm.el +lisp/tool-bar.el +lisp/tooltip.el +lisp/tree-widget.el +lisp/tutorial.el +lisp/type-break.el +lisp/uniquify.el +lisp/url/* +lisp/userlock.el +lisp/vc/* +lisp/vcursor.el +lisp/version.el +lisp/view.el +lisp/vt-control.el +lisp/vt100-led.el +lisp/wdired.el +lisp/whitespace.el +lisp/wid-browse.el +lisp/wid-edit.el +lisp/widget.el +lisp/windmove.el +lisp/window.el +lisp/winner.el +lisp/woman.el +lisp/x-dnd.el +lisp/xml.el +lisp/xt-mouse.el +lwlib/* +nt/subdirs.el +oldXMenu/* src/bitmaps/ -src/buffer.c -src/callint.c -src/callproc.c -src/casefiddle.c -src/casetab.c -src/category.c -src/ccl.c -src/charset.c -src/cm.c -src/cmds.c -src/coding.c -src/composite.c -src/config.in -src/data.c -src/doc.c -src/doprnt.c -src/ecrt0.c -src/emacs.c -src/epaths.in -src/fileio.c -src/filelock.c -src/filemode.c -src/firstfile.c -src/floatfns.c -src/fringe.c -src/fns.c -src/fontset.c -src/getloadavg.c -src/gmalloc.c -src/gtkutil.c -src/indent.c -src/insdel.c -src/image.c -src/lastfile.c -src/lread.c -src/macros.c -src/makefile.w32-in -src/marker.c -src/md5.c -src/minibuf.c -src/mktime.c -src/pre-crt0.c -src/prefix-args.c -src/print.c -src/process.c -src/ralloc.c -src/region-cache.c -src/scroll.c -src/search.c -src/sound.c -src/strftime.c -src/sysdep.c -src/termcap.c -src/terminfo.c -src/textprop.c -src/tparam.c -src/undo.c -src/unexaix.c -src/unexalpha.c -src/unexelf.c -src/unexhp9k800.c -src/vm-limit.c -src/widget.c -src/xfns.c -src/xmenu.c -src/xrdb.c -src/xselect.c -src/xterm.c +src/cygw32.c +src/cygw32.h +src/macfont.m +src/nsfns.m +src/nsfont.m +src/nsimage.m +src/nsmenu.m +src/nsselect.m +src/nsterm.m +test/automated/* +test/cedet/* +test/etags/* +test/rmailmm.el commit 139e55a58466058a8c9ae54536cb790ac7b7cc64 Author: Artur Malabarba Date: Sat Sep 26 17:40:57 2015 +0100 ; * admin/MAINTAINERS: Add entries for Artur Malabarba diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 677577d..fe7361c 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -76,6 +76,11 @@ Bastien Guerry lisp/org/* doc/misc/org.texi +Artur Malabarba + lisp/emacs-lisp/package.el + lisp/emacs-lisp/let-alist.el + lisp/character-fold.el + ============================================================================== 2. ============================================================================== @@ -138,6 +143,9 @@ Miles Bader src/editfns.c lisp/textmodes/refill.el +Artur Malabarba + lisp/isearch.el + ============================================================================== 3. ============================================================================== commit 88ab6655a81333d2970b93f7c8df570165dbd3c0 Author: Eli Zaretskii Date: Sat Sep 26 12:48:44 2015 +0300 ; * admin/MAINTAINERS: Update Eli Zaretskii's interests diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS index 61c70c1..677577d 100644 --- a/admin/MAINTAINERS +++ b/admin/MAINTAINERS @@ -24,6 +24,8 @@ Eli Zaretskii src/bidi.c bidirectional editing support in xdisp.c and elsewhere lisp/term/tty-colors.el + test/biditest.el + test/redisplay-testsuite.el The MS-DOS (a.k.a. DJGPP) port: config.bat @@ -85,7 +87,6 @@ Kelvin White Eli Zaretskii doc/* - lispref/* src/xfaces.c src/xdisp.c @@ -94,18 +95,32 @@ Eli Zaretskii src/dispextern.h src/frame.c src/dired.c + src/fileio.c src/unexw32.c src/w32*.[ch] src/window.c + src/indent.c + src/region-cache.[ch] nt/* + lib-src/ntlib.[ch] + lib-src/etags.c + lisp/arc-mode.el lisp/menu-bar.el lisp/hexl.el lisp/info.el lisp/ls-lisp.el lisp/startup.el + lisp/filenotify.el lisp/w32*.el + lisp/term/w32*.el + lisp/progmodes/gdb-mi.el + lisp/textmodes/ispell.el + lisp/textmodes/flyspell.el + lisp/mail/rmail*.el + + Mule admin/unidata/*