branch: master
commit 1aad21336c817c8cf3e04fe65899cecc969f53bb
Author: Stefan Monnier <monn...@iro.umontreal.ca>
Commit: Stefan Monnier <monn...@iro.umontreal.ca>
* copyright_exceptions: Update for new uni-confusables/gen-confusables.el
---
.gitignore | 5 ++++
GNUmakefile | 30 ++++++++--------------
copyright_exceptions | 3 ++-
packages/cobol-mode/cobol-mode.el | 15 +++++++----
.../context-coloring/context-coloring-coverage.el | 2 +-
packages/load-dir/load-dir.el | 12 ++++-----
.../realgud/realgud/common/buffer/backtrace.el | 8 +++---
packages/url-http-ntlm/url-http-ntlm.el | 7 +++--
8 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7f7e600..9b8033b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,12 @@ packages/*/*-pkg.el
# External packages with their own .git tree [autogenerated].
packages/auctex/
+packages/bbdb/
packages/chess/
+packages/cl-print/
packages/dash/
packages/dismal/
+packages/ebdb/
packages/ergoemacs-mode/
packages/exwm/
packages/hyperbole/
@@ -21,9 +24,11 @@ packages/let-alist/
packages/ntlm/
packages/omn-mode/
packages/pabbrev/
+packages/psgml/
packages/python/
packages/rudel/
packages/soap-client/
+packages/sql-indent/
packages/w3/
packages/xelb/
diff --git a/GNUmakefile b/GNUmakefile
index e9dd3db..87f7854 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -147,30 +147,22 @@ $(foreach al, $(autoloads), $(eval $(call RULE-srcdeps,
$(al))))
# I.e. one for each .el file in each package root, except for the -pkg.el,
# the -autoloads.el, the .el files that are marked "no-byte-compile", and
# files matching patterns in packages' .elpaignore files.
-included_els := $(shell \
- for pt in packages/*; do \
- if [ -d $$pt ]; then \
- prev=$$(pwd); \
- cd $$pt; \
- if [ -f .elpaignore ]; then \
- tar -ch --no-recursion \
- --exclude-vcs -X .elpaignore *.el \
- | tar --list; \
- else \
- ls -1 *.el; \
- fi | while read line; \
- do echo "$${pt}/$${line}"; \
- done; \
- cd $$prev; \
- fi; \
- done)
+included_els := $(shell tar -cvhf /dev/null --exclude-ignore=.elpaignore \
+ --exclude-vcs packages 2>&1 | grep '\.el$$')
+
+# included_els := $(wildcard packages/*/*.el)
+
+# els := $(call FILTER-nonsrc, $(wildcard packages/*/*.el \
+# packages/*/*/*.el \
+# packages/*/*/*/*.el \
+# packages/*/*/*/*/*.el))
els := $(call FILTER-nonsrc, $(included_els))
naive_elcs := $(patsubst %.el, %.elc, $(els))
-current_elcs := $(wildcard packages/*/*.elc)
+current_elcs := $(shell find packages -name '*.elc' -print)
extra_els := $(call SET-diff, $(els), $(patsubst %.elc, %.el, $(current_elcs)))
nbc_els := $(foreach el, $(extra_els), \
- $(if $(shell grep '^;.*no-byte-compile: t' "$(el)"), $(el)))
+ $(if $(shell grep '^;.*no-byte-compile: *t' "$(el)"), $(el)))
elcs := $(call SET-diff, $(naive_elcs), $(patsubst %.el, %.elc, $(nbc_els)))
# '(dolist (al (quote ($(patsubst %, "%", $(autoloads))))) (load
(expand-file-name al) nil t))'
diff --git a/copyright_exceptions b/copyright_exceptions
index da73782..1d33a12 100644
--- a/copyright_exceptions
+++ b/copyright_exceptions
@@ -70,7 +70,8 @@
./muse/htmlize-hack.el
./rudel/rudel-loaddefs.el
./uni-confusables/gen-confusables.el:;; Copyright (C) 1991-2009, 2010 Unicode,
Inc.
-./uni-confusables/gen-confusables.el:;; for the copyright and permission
notice.
+./uni-confusables/gen-confusables.el:;; gen-confusables.el. The copyright and
permissions are the same
+./uni-confusables/gen-confusables.el:;; list (covered by the Unicode copyright
terms in copyright.html)
./uni-confusables/uni-confusables.el
./uni-confusables/uni-confusables.el:;; Copyright (C) 1991-2009, 2010 Unicode,
Inc.
./uni-confusables/uni-confusables.el:;; for the copyright and permission
notice.
diff --git a/packages/cobol-mode/cobol-mode.el
b/packages/cobol-mode/cobol-mode.el
index aed0370..a5c8be6 100644
--- a/packages/cobol-mode/cobol-mode.el
+++ b/packages/cobol-mode/cobol-mode.el
@@ -2476,17 +2476,22 @@ and ignored areas) between points BEG and END."
`(,prompt "WHEN " str
,@(let ((clauses nil))
(dotimes (_ num-also)
- (setf clauses (append clauses `(" ALSO " (skeleton-read ,prompt)))))
+ (push `(" ALSO " (skeleton-read ,prompt)) clauses))
clauses)
> \n > _ \n))
+(defvar cobol--num-conds)
+
(define-skeleton cobol-skeleton-evaluate
"Insert an EVALUATE - END-EVALUATE block."
"Variable/TRUE: "
- ;; This is set like so because num-conds is incremented even when no str is
supplied.
- '(setf num-conds -1)
- > "EVALUATE " str ("Variable/TRUE: " '(setf num-conds (1+ num-conds)) " ALSO
" str) > \n
- (cobol-when-with-also "Value/Condition: " num-conds)
+ ;; This is set like so because cobol--num-conds is incremented even when no
str is supplied.
+ '(setf cobol--num-conds -1)
+ > "EVALUATE " str ("Variable/TRUE: "
+ '(setf cobol--num-conds (1+ cobol--num-conds))
+ " ALSO " str)
+ > \n
+ (cobol-when-with-also "Value/Condition: " cobol--num-conds)
"END-EVALUATE")
(define-skeleton cobol-skeleton-program
diff --git a/packages/context-coloring/context-coloring-coverage.el
b/packages/context-coloring/context-coloring-coverage.el
index fe990d9..e74024d 100644
--- a/packages/context-coloring/context-coloring-coverage.el
+++ b/packages/context-coloring/context-coloring-coverage.el
@@ -26,7 +26,7 @@
;;; Code:
(require 'json)
-(require 'undercover)
+(require 'undercover nil 'noerror) ;Don't signal an error during compilation.
(defconst context-coloring-coverage-directory
diff --git a/packages/load-dir/load-dir.el b/packages/load-dir/load-dir.el
index fe4f404..463c6cd 100644
--- a/packages/load-dir/load-dir.el
+++ b/packages/load-dir/load-dir.el
@@ -94,12 +94,12 @@ Will not load a file twice (use `load-dir-reload' for that).
Recurses into subdirectories if `load-dir-recursive' is t."
(interactive)
;; avoid the case where users inadvertently set `load-dirs' to a string
- (mapc 'load-dir-one (cond
- ((eq load-dirs t)
- (list (expand-file-name "~/.emacs.d/load.d")))
- ((stringp load-dirs)
- (list load-dirs))
- (t load-dirs))))
+ (mapc #'load-dir-one (cond
+ ((eq load-dirs t)
+ (list (expand-file-name "~/.emacs.d/load.d")))
+ ((stringp load-dirs)
+ (list load-dirs))
+ (t load-dirs))))
(defvar load-dir-loaded nil
"List of already loaded files.")
diff --git a/packages/realgud/realgud/common/buffer/backtrace.el
b/packages/realgud/realgud/common/buffer/backtrace.el
index 2b68bb0..84290be 100644
--- a/packages/realgud/realgud/common/buffer/backtrace.el
+++ b/packages/realgud/realgud/common/buffer/backtrace.el
@@ -209,7 +209,7 @@
)
)
-(defun realgud-backtrace-moveto-frame (num &optional opt-buffer)
+(defun realgud-backtrace-moveto-frame (num &optional _opt-buffer)
(if (integerp num)
(if (realgud-backtrace?)
(let* ((ring (realgud-sget 'backtrace-info 'frame-ring))
@@ -418,7 +418,7 @@ filename, line number, whether the frame is selected as
text properties."
(match-end frame-group-pat)))
(setq frame-num (string-to-number frame-num-str))
(setq frame-num-pos (match-beginning frame-group-pat))
- (add-to-list 'frame-num-pos-list frame-num-pos t)
+ (cl-pushnew frame-num-pos frame-num-pos-list)
(add-text-properties (match-beginning frame-group-pat)
(match-end frame-group-pat)
(list 'mouse-face 'highlight
@@ -433,7 +433,7 @@ filename, line number, whether the frame is selected as
text properties."
(match-end 0)))
(setq frame-num (cl-incf alt-frame-num))
(setq frame-num-pos (match-beginning 0))
- (add-to-list 'frame-num-pos-list frame-num-pos t)
+ (cl-pushnew frame-num-pos frame-num-pos-list)
(add-text-properties (match-beginning 0) (match-end 0)
(list 'mouse-face 'highlight
'help-echo "mouse-2: goto this frame"
@@ -473,7 +473,7 @@ filename, line number, whether the frame is selected as
text properties."
(setq selected-frame-num frame-num))
))
- (list string selected-frame-num frame-num-pos-list)
+ (list string selected-frame-num (nreverse frame-num-pos-list))
)
)
diff --git a/packages/url-http-ntlm/url-http-ntlm.el
b/packages/url-http-ntlm/url-http-ntlm.el
index dff0507..406ef6f 100644
--- a/packages/url-http-ntlm/url-http-ntlm.el
+++ b/packages/url-http-ntlm/url-http-ntlm.el
@@ -155,8 +155,7 @@ implementation -- this function is well and truly coupled."
(let* ((response-rxp "^NTLM TlRMTVNTUAADAAA")
(challenge-rxp "^TLRMTVNTUAACAAA")
(auth-header (assoc "Authorization" url-http-extra-headers))
- (case-fold-search t)
- stage)
+ (case-fold-search t))
(url-debug 'url-http-ntlm "Buffer: %s" (current-buffer))
(url-debug 'url-http-ntlm "Arguments: %s" args)
(url-debug 'url-http-ntlm "Previous arguments: %s"
url-http-ntlm--last-args)
@@ -260,7 +259,7 @@ Return nil if the NTLM Type-2 message is not present."
;;; Public function called by `url-get-authentication'.
;;;###autoload
-(defun url-ntlm-auth (url &optional prompt overwrite realm args)
+(defun url-ntlm-auth (url &optional prompt _overwrite realm args)
"Return an NTLM HTTP authorization header.
Get the contents of the Authorization header for a HTTP response
using NTLM authentication, to access URL. Because NTLM is a
@@ -292,7 +291,7 @@ the server's last response. These are used by
;; NTLM Type 1 message: the request
(:request
(url-http-ntlm--detect-loop user-url)
- (cl-destructuring-bind (&optional key hash)
+ (cl-destructuring-bind (&optional key _hash)
(url-http-ntlm--authorization user-url nil realm)
(when (cl-third key)
(url-http-ntlm--string
