commit e65d4d3a5d7748aa742112a6065e1eeeac0275a6 (HEAD, refs/remotes/origin/master) Author: Thierry Volpiatto Date: Thu Feb 25 16:43:52 2016 +1030 Add pcomplete support for find * lisp/pcmpl-gnu.el (pcomplete/find): Add pcomplete support for find (bug#10487). diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el index f84a1ce..84e42ae 100644 --- a/lisp/pcmpl-gnu.el +++ b/lisp/pcmpl-gnu.el @@ -329,6 +329,41 @@ nil 'identity)))) ;;;###autoload +(defun pcomplete/find () + "Completion for GNU find utility." + (let ((prec (pcomplete-arg 'last -1))) + (cond ((and (pcomplete-match "^-" 'last) + (string= "find" prec)) + (pcomplete-opt "HLPDO")) + ((pcomplete-match "^-" 'last) + (while (pcomplete-here + '("-amin" "-anewer" "-atime" "-cmin" "-cnewer" "-context" + "-ctime" "-daystart" "-delete" "-depth" "-empty" "-exec" + "-execdir" "-executable" "-false" "-fls" "-follow" + "-fprint" "-fprint0" "-fprintf" "-fstype" "-gid" "-group" + "-help" "-ignore_readdir_race" "-ilname" "-iname" + "-inum" "-ipath" "-iregex" "-iwholename" + "-links" "-lname" "-ls" "-maxdepth" + "-mindepth" "-mmin" "-mount" "-mtime" + "-name" "-newer" "-nogroup" "-noignore_readdir_race" + "-noleaf" "-nouser" "-nowarn" "-ok" + "-okdir" "-path" "-perm" "-print" + "-print0" "-printf" "-prune" "-quit" + "-readable" "-regex" "-regextype" "-samefile" + "-size" "-true" "-type" "-uid" + "-used" "-user" "-version" "-warn" + "-wholename" "-writable" "-xdev" "-xtype")))) + ((string= "-type" prec) + (while (pcomplete-here (list "b" "c" "d" "p" "f" "l" "s" "D")))) + ((string= "-xtype" prec) + (while (pcomplete-here (list "b" "c" "d" "p" "f" "l" "s")))) + ((or (string= prec "-exec") + (string= prec "-execdir")) + (while (pcomplete-here* (funcall pcomplete-command-completion-function) + (pcomplete-arg 'last) t)))) + (while (pcomplete-here (pcomplete-entries) nil 'identity)))) + +;;;###autoload (defalias 'pcomplete/gdb 'pcomplete/xargs) ;;; pcmpl-gnu.el ends here commit fecd5e589d01b39e9c0c2f0a9ed300ba8cb09817 Author: Per Starbäck Date: Thu Feb 25 16:22:17 2016 +1030 Replace XXX acronyms with draft standard ones * lisp/international/characters.el (c1-acronyms): Replace XXX entries with the acronyms PAD, HOP, SGCI from draft DIS 10646 (bug#13745). diff --git a/lisp/international/characters.el b/lisp/international/characters.el index a43c0f6..56f6c80 100644 --- a/lisp/international/characters.el +++ b/lisp/international/characters.el @@ -1307,10 +1307,10 @@ Setup char-width-table appropriate for non-CJK language environment." (aset char-acronym-table i (car c0-acronyms)) (setq c0-acronyms (cdr c0-acronyms)))) -(let ((c1-acronyms '("XXX" "XXX" "BPH" "NBH" "IND" "NEL" "SSA" "ESA" +(let ((c1-acronyms '("PAD" "HOP" "BPH" "NBH" "IND" "NEL" "SSA" "ESA" "HTS" "HTJ" "VTS" "PLD" "PLU" "R1" "SS2" "SS1" "DCS" "PU1" "PU2" "STS" "CCH" "MW" "SPA" "EPA" - "SOS" "XXX" "SC1" "CSI" "ST" "OSC" "PM" "APC"))) + "SOS" "SGCI" "SC1" "CSI" "ST" "OSC" "PM" "APC"))) (dotimes (i 32) (aset char-acronym-table (+ #x0080 i) (car c1-acronyms)) (setq c1-acronyms (cdr c1-acronyms)))) commit 80c4cfa965fe361884979c4f50ffcb2401bf1032 Author: Kevin Ryde Date: Thu Feb 25 16:16:37 2016 +1030 Make checkdoc warn about variables described as "True" * checkdoc.el (checkdoc-this-string-valid-engine): Docstrings for variables "True...", and functions "Return true...", should usually be "non-nil" (bug#15506). diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index ecf6f82..e93294d 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1638,6 +1638,17 @@ function,command,variable,option or symbol." ms1)))))) ;; * If a user option variable records a true-or-false ;; condition, give it a name that ends in `-flag'. + ;; "True ..." should be "Non-nil ..." + (when (looking-at "\"\\*?\\(True\\)\\b") + (if (checkdoc-autofix-ask-replace + (match-beginning 1) (match-end 1) + "Say \"Non-nil\" instead of \"True\"? " + "Non-nil") + nil + (checkdoc-create-error + "\"True\" should usually be \"Non-nil\"" + (match-beginning 1) (match-end 1)))) + ;; If the variable has -flag in the name, make sure (if (and (string-match "-flag$" (car fp)) (not (looking-at "\"\\*?Non-nil\\s-+means\\s-+"))) @@ -1798,6 +1809,16 @@ Replace with \"%s\"? " original replace) "Probably \"%s\" should be imperative \"%s\"" original replace) (match-beginning 1) (match-end 1)))))) + ;; "Return true ..." should be "Return non-nil ..." + (when (looking-at "\"Return \\(true\\)\\b") + (if (checkdoc-autofix-ask-replace + (match-beginning 1) (match-end 1) + "Say \"non-nil\" instead of \"true\"? " + "non-nil") + nil + (checkdoc-create-error + "\"true\" should usually be \"non-nil\"" + (match-beginning 1) (match-end 1)))) ;; Done with functions ))) ;;* When a documentation string refers to a Lisp symbol, write it as commit 75b0a03c09a05e30394b0a51fdeeb5a141155556 Author: Lars Ingebrigtsen Date: Thu Feb 25 15:54:29 2016 +1030 Add NEWS entry for "number string" change diff --git a/etc/NEWS b/etc/NEWS index ae503f6..ec68cce 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -47,6 +47,12 @@ to deal with asynchronous sockets is to avoid interacting with them until they have changed status to "run". This is most easily done from a process sentinel. +** `make-network-stream' has always allowed :service to be specified +as a "number string" (i.e., :service "993") when using gethostbyname, +but has required using a real number (i.e., :service 993) on systems +without gethostbyname. This difference has now been eliminated, and +you can use "number strings" on all systems. + ** It is possible to disable attempted recovery on fatal signals Two new variables allow to disable attempts to recover from stack commit e7650ba63b552def6892ca7913194ee8c85f20d1 Author: Lars Ingebrigtsen Date: Thu Feb 25 15:54:03 2016 +1030 Allow using "number strings" as services on non-GNU systems * src/process.c (string_integer_p): New function. (Fmake_network_process): Use it to allow connecting to services specified as "993" even when getaddrbyname isn't available. diff --git a/src/process.c b/src/process.c index 8c88e62..62a26c3 100644 --- a/src/process.c +++ b/src/process.c @@ -3428,6 +3428,17 @@ conv_numerical_to_lisp (unsigned char *number, int length, int port) } #endif +/* Return true if STRING consists only of numerical characters. */ +static bool +string_integer_p (Lisp_Object string) +{ + char *s = SSDATA (string), c; + while ((c = *s++)) + if (c < '0' || c > '9') + return false; + return true; +} + /* Create a network stream/datagram client/server process. Treated exactly like a normal process when reading and writing. Primary differences are in status display and process deletion. A network @@ -3852,6 +3863,10 @@ usage: (make-network-process &rest ARGS) */) port = 0; else if (INTEGERP (service)) port = (unsigned short) XINT (service); + /* Allow the service to be a string containing the port number, + because that's allowed if you have getaddrbyname. */ + else if (string_integer_p (service)) + port = strtol (SSDATA (service), NULL, 10); else { struct servent *svc_info; commit ce6a03cb00fb95b3e32440c1388d5f40375aadb2 Author: Michael Albinus Date: Wed Feb 24 11:02:48 2016 +0100 Fix problem in tramp.texi * doc/misc/tramp.texi (File name completion): Do not use @trampfn{} for IPv6 addresses. Somehow, it results in errors during PDF creation. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 0eb7334..45518b2 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -2219,7 +2219,8 @@ shows host names @value{tramp} from @file{/etc/hosts} file, for example. @multitable @columnfractions .5 .5 @c @multitable {@trampfn{telnet,melancholia.danann.net,}} {@trampfn{telnet,192.168.0.1,}} @item @trampfn{telnet,127.0.0.1,} @tab @trampfn{telnet,192.168.0.1,} -@item @trampfn{telnet,@value{ipv6prefix}::1@value{ipv6postfix},} @tab @trampfn{telnet,localhost,} +@c @item @trampfn{telnet,@value{ipv6prefix}::1@value{ipv6postfix},} @tab @trampfn{telnet,localhost,} +@item @value{prefix}telnet@value{postfixhop}@value{ipv6prefix}::1@value{ipv6postfix}@value{postfix} @tab @trampfn{telnet,localhost,} @item @trampfn{telnet,melancholia.danann.net,} @tab @trampfn{telnet,melancholia,} @end multitable @end example