aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2011-12-14 13:05:20 -0800
committerPaul Eggert2011-12-14 13:05:20 -0800
commitfac916bfd7f839a654c839dca609d0d75a77846a (patch)
tree814ac4124d77813a777326165c5e234cd4c54132 /lisp
parent898169a2d88c3538cdfd41feb0b16267165065bd (diff)
downloademacs-fac916bfd7f839a654c839dca609d0d75a77846a.tar.gz
emacs-fac916bfd7f839a654c839dca609d0d75a77846a.zip
Spelling fixes.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/ChangeLog.102
-rw-r--r--lisp/ChangeLog.112
-rw-r--r--lisp/ChangeLog.142
-rw-r--r--lisp/cedet/semantic/db-file.el12
-rw-r--r--lisp/cedet/semantic/db.el4
-rw-r--r--lisp/cedet/semantic/idle.el6
-rw-r--r--lisp/cedet/semantic/lex.el2
-rw-r--r--lisp/cedet/semantic/util-modes.el6
-rw-r--r--lisp/erc/erc-backend.el2
-rw-r--r--lisp/gnus/ChangeLog.22
-rw-r--r--lisp/gnus/gnus-group.el2
-rw-r--r--lisp/gnus/gnus-sum.el2
-rw-r--r--lisp/gnus/message.el2
-rw-r--r--lisp/gnus/rfc2231.el2
-rw-r--r--lisp/net/tramp-sh.el10
-rw-r--r--lisp/url/url-http.el4
-rw-r--r--lisp/vc/ediff-ptch.el2
18 files changed, 33 insertions, 33 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf042ec6c82..cb412197f3d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5275,7 +5275,7 @@
5275 (ses-calculate-cell, ses-update-cells): Use Dijkstra algorithm for 5275 (ses-calculate-cell, ses-update-cells): Use Dijkstra algorithm for
5276 cycle detection. 5276 cycle detection.
5277 (ses-self-reference-early-detection): New defcustom. 5277 (ses-self-reference-early-detection): New defcustom.
5278 (ses-formula-references): Robustify against self-refering cells. 5278 (ses-formula-references): Robustify against self-referring cells.
5279 (ses-mode): Use ses-set-localvars. 5279 (ses-mode): Use ses-set-localvars.
5280 (ses-command-hook): Add call to ses-initialize-Dijkstra-attempt 5280 (ses-command-hook): Add call to ses-initialize-Dijkstra-attempt
5281 before lauching the update processing. 5281 before lauching the update processing.
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index a1cfaee6eaf..d6ac498c877 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -8278,7 +8278,7 @@
82782002-11-17 Markus Rost <rost@math.ohio-state.edu> 82782002-11-17 Markus Rost <rost@math.ohio-state.edu>
8279 8279
8280 * speedbar.el (defgroup speedbar): Use group 'etags instead of 8280 * speedbar.el (defgroup speedbar): Use group 'etags instead of
8281 nonexisting group 'tags. 8281 nonexistent group 'tags.
8282 8282
8283 * emacs-lisp/re-builder.el: Add provide call. 8283 * emacs-lisp/re-builder.el: Add provide call.
8284 8284
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 38a5530fbfc..dd1d113d665 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -1744,7 +1744,7 @@
1744 substitute-env-vars -- not quite shell compatible but better than 1744 substitute-env-vars -- not quite shell compatible but better than
1745 nothing. 1745 nothing.
1746 (compilation-error-regexp-alist-alist): Simplify ftnchek to only 1746 (compilation-error-regexp-alist-alist): Simplify ftnchek to only
1747 handle the newer versions messages, which are more parseable. 1747 handle the newer versions messages, which are more parsable.
1748 1748
17492004-11-22 Stefan Monnier <monnier@iro.umontreal.ca> 17492004-11-22 Stefan Monnier <monnier@iro.umontreal.ca>
1750 1750
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index 7063ed67b62..213f5cfb784 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -19176,7 +19176,7 @@
19176 toggle-read-only. 19176 toggle-read-only.
19177 19177
19178 * textmodes/bibtex.el (bibtex-format-entry): Handle error message 19178 * textmodes/bibtex.el (bibtex-format-entry): Handle error message
19179 refering to a missing required field with the OPT prefix. 19179 referring to a missing required field with the OPT prefix.
19180 Make unwindform more robust. 19180 Make unwindform more robust.
19181 19181
19182 * textmodes/bibtex.el: Remove support for hideshow minor mode as 19182 * textmodes/bibtex.el: Remove support for hideshow minor mode as
diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el
index 943ccf23031..9df240a3681 100644
--- a/lisp/cedet/semantic/db-file.el
+++ b/lisp/cedet/semantic/db-file.el
@@ -193,16 +193,16 @@ If DIRECTORY doesn't exist, create a new one."
193 (eieio-instance-tracker-find filename 'file 'semanticdb-database-list)) 193 (eieio-instance-tracker-find filename 'file 'semanticdb-database-list))
194 194
195(defmethod semanticdb-file-directory-exists-p ((DB semanticdb-project-database-file) 195(defmethod semanticdb-file-directory-exists-p ((DB semanticdb-project-database-file)
196 &optional supress-questions) 196 &optional suppress-questions)
197 "Does the directory the database DB needs to write to exist? 197 "Does the directory the database DB needs to write to exist?
198If SUPRESS-QUESTIONS, then do not ask to create the directory." 198If SUPPRESS-QUESTIONS, then do not ask to create the directory."
199 (let ((dest (file-name-directory (oref DB file))) 199 (let ((dest (file-name-directory (oref DB file)))
200 ) 200 )
201 (cond ((null dest) 201 (cond ((null dest)
202 ;; @TODO - If it was never set up... what should we do ? 202 ;; @TODO - If it was never set up... what should we do ?
203 nil) 203 nil)
204 ((file-exists-p dest) t) 204 ((file-exists-p dest) t)
205 ((or supress-questions 205 ((or suppress-questions
206 (and (boundp 'semanticdb--inhibit-make-directory) 206 (and (boundp 'semanticdb--inhibit-make-directory)
207 semanticdb--inhibit-make-directory)) 207 semanticdb--inhibit-make-directory))
208 nil) 208 nil)
@@ -216,13 +216,13 @@ If SUPRESS-QUESTIONS, then do not ask to create the directory."
216 216
217(defmethod semanticdb-save-db ((DB semanticdb-project-database-file) 217(defmethod semanticdb-save-db ((DB semanticdb-project-database-file)
218 &optional 218 &optional
219 supress-questions) 219 suppress-questions)
220 "Write out the database DB to its file. 220 "Write out the database DB to its file.
221If DB is not specified, then use the current database." 221If DB is not specified, then use the current database."
222 (let ((objname (oref DB file))) 222 (let ((objname (oref DB file)))
223 (when (and (semanticdb-dirty-p DB) 223 (when (and (semanticdb-dirty-p DB)
224 (semanticdb-live-p DB) 224 (semanticdb-live-p DB)
225 (semanticdb-file-directory-exists-p DB supress-questions) 225 (semanticdb-file-directory-exists-p DB suppress-questions)
226 (semanticdb-write-directory-p DB) 226 (semanticdb-write-directory-p DB)
227 ) 227 )
228 ;;(message "Saving tag summary for %s..." objname) 228 ;;(message "Saving tag summary for %s..." objname)
@@ -243,7 +243,7 @@ If DB is not specified, then use the current database."
243 (t 243 (t
244 ;; @todo - It should ask if we are not called from a hook. 244 ;; @todo - It should ask if we are not called from a hook.
245 ;; How? 245 ;; How?
246 (if (or supress-questions 246 (if (or suppress-questions
247 (y-or-n-p (format "Skip Error: %s ?" (car (cdr foo))))) 247 (y-or-n-p (format "Skip Error: %s ?" (car (cdr foo)))))
248 (message "Save Error: %S: %s" (car (cdr foo)) 248 (message "Save Error: %S: %s" (car (cdr foo))
249 objname) 249 objname)
diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el
index 3d2128db29a..c159a26dc1e 100644
--- a/lisp/cedet/semantic/db.el
+++ b/lisp/cedet/semantic/db.el
@@ -227,7 +227,7 @@ it is in Emacs.")
227 "Non nil if this table needs to be `Saved'.") 227 "Non nil if this table needs to be `Saved'.")
228 (db-refs :initform nil 228 (db-refs :initform nil
229 :documentation 229 :documentation
230 "List of `semanticdb-table' objects refering to this one. 230 "List of `semanticdb-table' objects referring to this one.
231These aren't saved, but are instead recalculated after load. 231These aren't saved, but are instead recalculated after load.
232See the file semantic/db-ref.el for how this slot is used.") 232See the file semantic/db-ref.el for how this slot is used.")
233 (pointmax :initarg :pointmax 233 (pointmax :initarg :pointmax
@@ -657,7 +657,7 @@ The file associated with OBJ does not need to be in a buffer."
657;;; SAVE/LOAD 657;;; SAVE/LOAD
658;; 658;;
659(defmethod semanticdb-save-db ((DB semanticdb-project-database) 659(defmethod semanticdb-save-db ((DB semanticdb-project-database)
660 &optional supress-questions) 660 &optional suppress-questions)
661 "Cause a database to save itself. 661 "Cause a database to save itself.
662The database base class does not save itself persistently. 662The database base class does not save itself persistently.
663Subclasses could save themselves to a file, or to a database, or other 663Subclasses could save themselves to a file, or to a database, or other
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 4b3a51e79f7..c60ca4b4b6a 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -246,8 +246,8 @@ And also manages services that depend on tag values."
246 246
247 ;; NOTE ON COMMENTED SAFE HERE 247 ;; NOTE ON COMMENTED SAFE HERE
248 ;; We used to not execute the services if the buffer was 248 ;; We used to not execute the services if the buffer was
249 ;; unparseable. We now assume that they are lexically 249 ;; unparsable. We now assume that they are lexically
250 ;; safe to do, because we have marked the buffer unparseable 250 ;; safe to do, because we have marked the buffer unparsable
251 ;; if there was a problem. 251 ;; if there was a problem.
252 ;;(when safe 252 ;;(when safe
253 (dolist (service semantic-idle-scheduler-queue) 253 (dolist (service semantic-idle-scheduler-queue)
@@ -476,7 +476,7 @@ Does nothing if the current buffer doesn't need reparsing."
476 ;; do them here, then all the bovination hooks are not run, and 476 ;; do them here, then all the bovination hooks are not run, and
477 ;; we save lots of time. 477 ;; we save lots of time.
478 (cond 478 (cond
479 ;; If the buffer was previously marked unparseable, 479 ;; If the buffer was previously marked unparsable,
480 ;; then don't waste our time. 480 ;; then don't waste our time.
481 ((semantic-parse-tree-unparseable-p) 481 ((semantic-parse-tree-unparseable-p)
482 nil) 482 nil)
diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el
index dab5c444fae..f8e72c1027c 100644
--- a/lisp/cedet/semantic/lex.el
+++ b/lisp/cedet/semantic/lex.el
@@ -1704,7 +1704,7 @@ If there is no error, then the last value of FORMS is returned."
1704 nil)))) 1704 nil))))
1705 ;; Great Sadness. Assume that FORMS execute within the 1705 ;; Great Sadness. Assume that FORMS execute within the
1706 ;; confines of the current buffer only! Mark this thing 1706 ;; confines of the current buffer only! Mark this thing
1707 ;; unparseable iff the special symbol was thrown. This 1707 ;; unparsable iff the special symbol was thrown. This
1708 ;; will prevent future calls from parsing, but will allow 1708 ;; will prevent future calls from parsing, but will allow
1709 ;; then to still return the cache. 1709 ;; then to still return the cache.
1710 (when ,ret 1710 (when ,ret
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index a08f4a31b30..13836f64b85 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -109,7 +109,7 @@ Only minor modes that are locally enabled are shown in the mode line."
109 (tail (or (memq elem minor-mode-alist) 109 (tail (or (memq elem minor-mode-alist)
110 (setq minor-mode-alist 110 (setq minor-mode-alist
111 (cons elem minor-mode-alist))))) 111 (cons elem minor-mode-alist)))))
112 (setcdr tail (nconc locals (cdr tail))))))))) 112 (setcdr tail (nconc locals (cdr tail)))))))))
113 113
114(defun semantic-desktop-ignore-this-minor-mode (buffer) 114(defun semantic-desktop-ignore-this-minor-mode (buffer)
115 "Installed as a minor-mode initializer for Desktop mode. 115 "Installed as a minor-mode initializer for Desktop mode.
@@ -438,7 +438,7 @@ The state is indicated in the modeline with the following characters:
438 `-' -> The cache is up to date. 438 `-' -> The cache is up to date.
439 `!' -> The cache requires a full update. 439 `!' -> The cache requires a full update.
440 `~' -> The cache needs to be incrementally parsed. 440 `~' -> The cache needs to be incrementally parsed.
441 `%' -> The cache is not currently parseable. 441 `%' -> The cache is not currently parsable.
442 `@' -> Auto-parse in progress (not set here.) 442 `@' -> Auto-parse in progress (not set here.)
443With prefix argument ARG, turn on if positive, otherwise off. The 443With prefix argument ARG, turn on if positive, otherwise off. The
444minor mode can be turned on only if semantic feature is available and 444minor mode can be turned on only if semantic feature is available and
@@ -524,7 +524,7 @@ This marker is one of the following:
524 `-' -> The cache is up to date. 524 `-' -> The cache is up to date.
525 `!' -> The cache requires a full update. 525 `!' -> The cache requires a full update.
526 `~' -> The cache needs to be incrementally parsed. 526 `~' -> The cache needs to be incrementally parsed.
527 `%' -> The cache is not currently parseable. 527 `%' -> The cache is not currently parsable.
528 `@' -> Auto-parse in progress (not set here.) 528 `@' -> Auto-parse in progress (not set here.)
529Arguments IGNORE are ignored, and accepted so this can be used as a hook 529Arguments IGNORE are ignored, and accepted so this can be used as a hook
530in many situations." 530in many situations."
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 5baa676ab39..112091af219 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -991,7 +991,7 @@ Hands off to helper functions via `erc-call-hooks'."
991 (if (member (erc-response.command parsed-response) 991 (if (member (erc-response.command parsed-response)
992 erc-server-prevent-duplicates) 992 erc-server-prevent-duplicates)
993 (let ((m (erc-response.unparsed parsed-response))) 993 (let ((m (erc-response.unparsed parsed-response)))
994 ;; duplicate supression 994 ;; duplicate suppression
995 (if (< (or (gethash m erc-server-duplicates) 0) 995 (if (< (or (gethash m erc-server-duplicates) 0)
996 (- (erc-current-time) erc-server-duplicate-timeout)) 996 (- (erc-current-time) erc-server-duplicate-timeout))
997 (erc-call-hooks process parsed-response)) 997 (erc-call-hooks process parsed-response))
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 893ee88e98d..64b15ce31b3 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -8442,7 +8442,7 @@
8442 8442
84432002-07-21 Nevin Kapur <nevin@jhu.edu> 84432002-07-21 Nevin Kapur <nevin@jhu.edu>
8444 8444
8445 * nnmail.el (nnmail-fancy-expiry-target): Treat nonexisting 8445 * nnmail.el (nnmail-fancy-expiry-target): Treat nonexistent
8446 headers as empty headers. 8446 headers as empty headers.
8447 8447
84482002-07-21 Jochen Hein <jochen@jochen.org> 84482002-07-21 Jochen Hein <jochen@jochen.org>
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 694b4d7e8b4..9730b69164e 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -992,7 +992,7 @@ Setter function for custom variables."
992 'gnus-group-tool-bar-retro) 992 'gnus-group-tool-bar-retro)
993 "Specifies the Gnus group tool bar. 993 "Specifies the Gnus group tool bar.
994 994
995It can be either a list or a symbol refering to a list. See 995It can be either a list or a symbol referring to a list. See
996`gmm-tool-bar-from-list' for the format of the list. The 996`gmm-tool-bar-from-list' for the format of the list. The
997default key map is `gnus-group-mode-map'. 997default key map is `gnus-group-mode-map'.
998 998
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 17ccae986e9..d8db300efbd 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -2835,7 +2835,7 @@ Setter function for custom variables."
2835 'gnus-summary-tool-bar-retro) 2835 'gnus-summary-tool-bar-retro)
2836 "Specifies the Gnus summary tool bar. 2836 "Specifies the Gnus summary tool bar.
2837 2837
2838It can be either a list or a symbol refering to a list. See 2838It can be either a list or a symbol referring to a list. See
2839`gmm-tool-bar-from-list' for the format of the list. The 2839`gmm-tool-bar-from-list' for the format of the list. The
2840default key map is `gnus-summary-mode-map'. 2840default key map is `gnus-summary-mode-map'.
2841 2841
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 85c084751f8..8fbd2c765fe 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7738,7 +7738,7 @@ Setter function for custom variables."
7738 'message-tool-bar-retro) 7738 'message-tool-bar-retro)
7739 "Specifies the message mode tool bar. 7739 "Specifies the message mode tool bar.
7740 7740
7741It can be either a list or a symbol refering to a list. See 7741It can be either a list or a symbol referring to a list. See
7742`gmm-tool-bar-from-list' for the format of the list. The 7742`gmm-tool-bar-from-list' for the format of the list. The
7743default key map is `message-mode-map'. 7743default key map is `message-mode-map'.
7744 7744
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index 306b67cd7c1..9c30379ef6e 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -58,7 +58,7 @@ must never cause a Lisp error."
58 ;; The most likely cause of an error is unbalanced parentheses 58 ;; The most likely cause of an error is unbalanced parentheses
59 ;; or double-quotes. If all parentheses and double-quotes are 59 ;; or double-quotes. If all parentheses and double-quotes are
60 ;; quoted meaninglessly with backslashes, removing them might 60 ;; quoted meaninglessly with backslashes, removing them might
61 ;; make it parseable. Let's try... 61 ;; make it parsable. Let's try...
62 (error 62 (error
63 (let (mod) 63 (let (mod)
64 (when (and (string-match "\\\\\"" string) 64 (when (and (string-match "\\\\\"" string)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index da6f8a69e6d..446a27c65d3 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3526,7 +3526,7 @@ variable PATH."
3526Here, we are looking for a command which has zero exit status if the 3526Here, we are looking for a command which has zero exit status if the
3527file exists and nonzero exit status otherwise." 3527file exists and nonzero exit status otherwise."
3528 (let ((existing "/") 3528 (let ((existing "/")
3529 (nonexisting 3529 (nonexistent
3530 (tramp-shell-quote-argument "/ this file does not exist ")) 3530 (tramp-shell-quote-argument "/ this file does not exist "))
3531 result) 3531 result)
3532 ;; The algorithm is as follows: we try a list of several commands. 3532 ;; The algorithm is as follows: we try a list of several commands.
@@ -3551,22 +3551,22 @@ file exists and nonzero exit status otherwise."
3551 (tramp-send-command-and-check 3551 (tramp-send-command-and-check
3552 vec (format "%s %s" result existing)) 3552 vec (format "%s %s" result existing))
3553 (not (tramp-send-command-and-check 3553 (not (tramp-send-command-and-check
3554 vec (format "%s %s" result nonexisting)))) 3554 vec (format "%s %s" result nonexistent))))
3555 (and (setq result "/bin/test -e") 3555 (and (setq result "/bin/test -e")
3556 (tramp-send-command-and-check 3556 (tramp-send-command-and-check
3557 vec (format "%s %s" result existing)) 3557 vec (format "%s %s" result existing))
3558 (not (tramp-send-command-and-check 3558 (not (tramp-send-command-and-check
3559 vec (format "%s %s" result nonexisting)))) 3559 vec (format "%s %s" result nonexistent))))
3560 (and (setq result "/usr/bin/test -e") 3560 (and (setq result "/usr/bin/test -e")
3561 (tramp-send-command-and-check 3561 (tramp-send-command-and-check
3562 vec (format "%s %s" result existing)) 3562 vec (format "%s %s" result existing))
3563 (not (tramp-send-command-and-check 3563 (not (tramp-send-command-and-check
3564 vec (format "%s %s" result nonexisting)))) 3564 vec (format "%s %s" result nonexistent))))
3565 (and (setq result (format "%s -d" (tramp-get-ls-command vec))) 3565 (and (setq result (format "%s -d" (tramp-get-ls-command vec)))
3566 (tramp-send-command-and-check 3566 (tramp-send-command-and-check
3567 vec (format "%s %s" result existing)) 3567 vec (format "%s %s" result existing))
3568 (not (tramp-send-command-and-check 3568 (not (tramp-send-command-and-check
3569 vec (format "%s %s" result nonexisting))))) 3569 vec (format "%s %s" result nonexistent)))))
3570 (tramp-error 3570 (tramp-error
3571 vec 'file-error "Couldn't find command to check if file exists")) 3571 vec 'file-error "Couldn't find command to check if file exists"))
3572 result)) 3572 result))
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index a9ff042d681..9b9bdb6416e 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -237,12 +237,12 @@ request.")
237 (if proxy-auth 237 (if proxy-auth
238 (setq proxy-auth (concat "Proxy-Authorization: " proxy-auth "\r\n"))) 238 (setq proxy-auth (concat "Proxy-Authorization: " proxy-auth "\r\n")))
239 239
240 ;; Protection against stupid values in the referer 240 ;; Protection against stupid values in the referrer
241 (if (and ref-url (stringp ref-url) (or (string= ref-url "file:nil") 241 (if (and ref-url (stringp ref-url) (or (string= ref-url "file:nil")
242 (string= ref-url ""))) 242 (string= ref-url "")))
243 (setq ref-url nil)) 243 (setq ref-url nil))
244 244
245 ;; We do not want to expose the referer if the user is paranoid. 245 ;; We do not want to expose the referrer if the user is paranoid.
246 (if (or (memq url-privacy-level '(low high paranoid)) 246 (if (or (memq url-privacy-level '(low high paranoid))
247 (and (listp url-privacy-level) 247 (and (listp url-privacy-level)
248 (memq 'lastloc url-privacy-level))) 248 (memq 'lastloc url-privacy-level)))
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index ef273c610fe..6563dca5ec6 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -373,7 +373,7 @@ other files, enter /dev/null
373 (concat actual-dir (cdr proposed-file-names))))) 373 (concat actual-dir (cdr proposed-file-names)))))
374 )) 374 ))
375 ediff-patch-map) 375 ediff-patch-map)
376 ;; Check for the existing files in each pair and discard the nonexisting 376 ;; Check for the existing files in each pair and discard the nonexistent
377 ;; ones. If both exist, ask the user. 377 ;; ones. If both exist, ask the user.
378 (mapcar (lambda (session-info) 378 (mapcar (lambda (session-info)
379 (let* ((file1 (car (ediff-get-session-objA-name session-info))) 379 (let* ((file1 (car (ediff-get-session-objA-name session-info)))