commit 40892b46f8219e4c7795038f91878f85eaeb7bc5 (HEAD, refs/remotes/origin/master) Author: Michael Albinus Date: Sat Oct 3 10:09:41 2015 +0200 ; Tramp: Suppress compiler warnings. diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index ab67120..bba27e3 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -42,7 +42,8 @@ "Try to return as a string the repository revision of the Tramp sources." (unless (featurep 'xemacs) (let ((dir - (funcall 'locate-dominating-file (locate-library "tramp") ".git"))) + (funcall + (intern "locate-dominating-file") (locate-library "tramp") ".git"))) (when dir (with-temp-buffer (let ((default-directory (file-name-as-directory dir))) @@ -50,7 +51,8 @@ (ignore-errors (call-process "git" nil '(t nil) nil "rev-parse" "HEAD"))) (not (zerop (buffer-size))) - (tramp-compat-replace-regexp-in-string + (funcall + (intern "tramp-compat-replace-regexp-in-string") "\n" "" (buffer-string))))))))) ;; Check for (X)Emacs version. commit e1605252fd8ca904e83782a5bbfce15564ef7696 Author: Tassilo Horn Date: Sat Oct 3 07:49:08 2015 +0200 Adapt to new prettify-symbols-unprettify-at-point default * etc/NEWS: Mention that unprettication of symbol at point is off by default. diff --git a/etc/NEWS b/etc/NEWS index ac9a600..26c478e 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -326,7 +326,7 @@ character. `prettify-symbols-default-compose-p' is the default which is suitable for most programming languages such as C or Lisp (but not (La)TeX). -*** Symbols are not prettified while point is inside them. +*** Symbols can be unprettified while point is inside them. New variable `prettify-symbols-unprettify-at-point' configures this. ** New `xterm-screen-extra-capabilities' config. commit de7fc458e99867b6cb540ec033c3b740a1dd65e9 Author: Tassilo Horn Date: Sat Oct 3 06:01:42 2015 +0200 Revert my two recent process.c changes Revert "Improve last commit to process.c" and "Remove callback-handled channels from Available set" because they did not fix bug#21313. This reverts commits bfa1aa8e2bdaf14adbbf1e9e824051d3f740694c and 27f871907cc24f33a7d12ac3a4ab71a88f0bc554.. diff --git a/src/process.c b/src/process.c index 42dd17c..55f31a0 100644 --- a/src/process.c +++ b/src/process.c @@ -5031,18 +5031,12 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, for (channel = 0; channel <= max_input_desc; ++channel) { struct fd_callback_data *d = &fd_callback_info[channel]; - if (d->func) - { - if (d->condition & FOR_READ - && FD_ISSET (channel, &Available)) - { - d->func (channel, d->data); - FD_CLR (channel, &Available); - } - else if (d->condition & FOR_WRITE - && FD_ISSET (channel, &write_mask)) - d->func (channel, d->data); - } + if (d->func + && ((d->condition & FOR_READ + && FD_ISSET (channel, &Available)) + || (d->condition & FOR_WRITE + && FD_ISSET (channel, &write_mask)))) + d->func (channel, d->data); } for (channel = 0; channel <= max_process_desc; channel++) commit d771ae0d5f4259d1a23b202e0cbef7341eb5dd92 Author: Markus Triska Date: Fri Oct 2 16:47:06 2015 -0400 * prolog.el: Update and extend operator table (prolog-smie-grammar): Add multifile, public etc. diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index ff2769e..81aeb8d 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -877,12 +877,21 @@ This is really kludgy, and unneeded (i.e. obsolete) in Emacs>=24." ;; manual uses precedence levels in the opposite sense (higher ;; numbers bind less tightly) than SMIE, so we use negative numbers. '(("." -10000 -10000) + ("?-" nil -1200) (":-" -1200 -1200) ("-->" -1200 -1200) + ("discontiguous" nil -1150) + ("dynamic" nil -1150) + ("meta_predicate" nil -1150) + ("module_transparent" nil -1150) + ("multifile" nil -1150) + ("public" nil -1150) + ("|" -1105 -1105) (";" -1100 -1100) + ("*->" -1050 -1050) ("->" -1050 -1050) ("," -1000 -1000) - ("\\+" -900 -900) + ("\\+" nil -900) ("=" -700 -700) ("\\=" -700 -700) ("=.." -700 -700) commit 4cace70436a58a88843420dad26e56ec35e162a5 Author: Paul Eggert Date: Fri Oct 2 12:40:57 2015 -0700 Allow autogen even when Git is not installed * autogen.sh: Test ‘git status’ before trying to use Git. diff --git a/autogen.sh b/autogen.sh index 926915c..563a024 100755 --- a/autogen.sh +++ b/autogen.sh @@ -218,7 +218,7 @@ echo timestamp > src/stamp-h.in || exit ## Configure Git, if using Git. -if test -d .git; then +if test -d .git && (git status -s) >/dev/null 2>&1; then # Configure 'git diff' hunk header format. commit a5c20339c5318a59b0cafd7df6bf476e957d05d4 Author: Stefan Monnier Date: Fri Oct 2 15:24:23 2015 -0400 * lisp/vc/vc-git.el (vc-git-region-history): Handle local changes Adjust lto/lfrom when we have uncommitted changes. diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 2f04393..b557032 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -974,6 +974,34 @@ or BRANCH^ (where \"^\" can be repeated)." (buffer-string)))) (defun vc-git-region-history (file buffer lfrom lto) + ;; The "git log" command below interprets the line numbers as applying + ;; to the HEAD version of the file, not to the current state of the file. + ;; So we need to look at all the local changes and adjust lfrom/lto + ;; accordingly. + ;; FIXME: Maybe this should be done in vc.el (i.e. for all backends), but + ;; since Git is the only backend to support this operation so far, it's hard + ;; to tell. + (with-temp-buffer + (vc-call-backend 'git 'diff file "HEAD" nil (current-buffer)) + (goto-char (point-min)) + (let ((last-offset 0) + (from-offset nil) + (to-offset nil)) + (while (re-search-forward + "^@@ -\\([0-9]+\\),\\([0-9]+\\) \\+\\([0-9]+\\),\\([0-9]+\\) @@" nil t) + (let ((headno (string-to-number (match-string 1))) + (headcnt (string-to-number (match-string 2))) + (curno (string-to-number (match-string 3))) + (curcnt (string-to-number (match-string 4)))) + (cl-assert (equal (- curno headno) last-offset)) + (and (null from-offset) (> curno lfrom) + (setq from-offset last-offset)) + (and (null to-offset) (> curno lto) + (setq to-offset last-offset)) + (setq last-offset + (- (+ curno curcnt) (+ headno headcnt))))) + (setq lto (- lto (or to-offset last-offset))) + (setq lfrom (- lfrom (or to-offset last-offset))))) (vc-git-command buffer 'async nil "log" "-p" ;"--follow" ;FIXME: not supported? (format "-L%d,%d:%s" lfrom lto (file-relative-name file)))) commit 355ccbcf332d766231bd441e0971e481907785bc Author: Paul Eggert Date: Fri Oct 2 08:34:15 2015 -0700 Fix problems found by clang 3.5.0 * src/cmds.c (Fdelete_char): Don’t assume XINT returns int. * src/font.c (font_parse_family_registry): Use &"str"[X] instead of "str"+X, to pacify clang -Wstring-plus-int. diff --git a/src/cmds.c b/src/cmds.c index 7a575ae..ccc6891 100644 --- a/src/cmds.c +++ b/src/cmds.c @@ -264,7 +264,7 @@ because it respects values of `delete-active-region' and `overwrite-mode'. */) CHECK_NUMBER (n); - if (abs (XINT (n)) < 2) + if (eabs (XINT (n)) < 2) remove_excessive_undo_boundaries (); pos = PT + XINT (n); diff --git a/src/font.c b/src/font.c index ce144e7..a52a653 100644 --- a/src/font.c +++ b/src/font.c @@ -1770,7 +1770,7 @@ font_parse_family_registry (Lisp_Object family, Lisp_Object registry, Lisp_Objec p1 = strchr (p0, '-'); if (! p1) { - AUTO_STRING (extra, ("*-*" + (len && p0[len - 1] == '*'))); + AUTO_STRING (extra, (&"*-*"[len && p0[len - 1] == '*'])); registry = concat2 (registry, extra); } registry = Fdowncase (registry); commit da4ce83c621f31c4b6690ab7fcb77c1104ed2295 Author: Eli Zaretskii Date: Fri Oct 2 11:55:55 2015 +0300 * nt/INSTALL: Update instructions for running autogen.sh diff --git a/nt/INSTALL b/nt/INSTALL index c969da7..86c4ad3 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -381,8 +381,13 @@ build will run on Windows 9X and newer systems). Checking for automake (need at least version 1.11)... ok Your system has the required tools, running autoreconf... + Installing git hooks... You can now run `./configure'. + If the script fails because it cannot find Git, you will need to + arrange for the MSYS Bash's PATH to include the Git's 'bin' + sibdirectory, where there's the git.exe executable. + * Configuring Emacs for MinGW: Now it's time to run the configure script. You can do that either