Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ca23cc88
Commit
ca23cc88
authored
Apr 04, 2011
by
Paul Eggert
Browse files
Merge from mainline.
parents
d5efd1d1
b87a8200
Changes
42
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
289 additions
and
120 deletions
+289
-120
etc/NEWS
etc/NEWS
+7
-0
lisp/ChangeLog
lisp/ChangeLog
+104
-9
lisp/bs.el
lisp/bs.el
+18
-18
lisp/custom.el
lisp/custom.el
+14
-0
lisp/dired-aux.el
lisp/dired-aux.el
+17
-22
lisp/dired.el
lisp/dired.el
+7
-7
lisp/ehelp.el
lisp/ehelp.el
+3
-3
lisp/emacs-lisp/package.el
lisp/emacs-lisp/package.el
+1
-1
lisp/emacs-lisp/re-builder.el
lisp/emacs-lisp/re-builder.el
+2
-2
lisp/epa-dired.el
lisp/epa-dired.el
+1
-1
lisp/epa-file.el
lisp/epa-file.el
+1
-1
lisp/epa-hook.el
lisp/epa-hook.el
+1
-1
lisp/epa-mail.el
lisp/epa-mail.el
+2
-2
lisp/epa.el
lisp/epa.el
+7
-7
lisp/epg.el
lisp/epg.el
+20
-20
lisp/files.el
lisp/files.el
+3
-0
lisp/find-dired.el
lisp/find-dired.el
+54
-21
lisp/gnus/ChangeLog
lisp/gnus/ChangeLog
+17
-0
lisp/gnus/gnus-start.el
lisp/gnus/gnus-start.el
+3
-1
lisp/gnus/gnus-sum.el
lisp/gnus/gnus-sum.el
+7
-4
No files found.
etc/NEWS
View file @
ca23cc88
...
...
@@ -349,6 +349,7 @@ between applications.
*** To return to the previous behavior, do the following:
**** Change `select-active-regions' to nil.
**** Change `mouse-drag-copy-region' to t.
**** Change `x-select-enable-primary' to t (on X only).
**** Change `x-select-enable-clipboard' to nil.
...
...
@@ -773,6 +774,12 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
* Lisp changes in Emacs 24.1
** `open-network-stream' can now be used to open an encrypted stream.
It now accepts an optional `:type' parameter for initiating a TLS
connection, directly or via STARTTLS. To do STARTTLS, additional
parameters (`:end-of-command', `:success', `:capabilities-command')
must also be supplied.
** Code can now use lexical scoping by default instead of dynamic scoping.
The `lexical-binding' variable lets code use lexical scoping for local
variables. It is typically set via file-local variables, in which case it
...
...
lisp/ChangeLog
View file @
ca23cc88
2011-04-05 Deniz Dogan <deniz@dogan.se>
* net/rcirc.el: Update my e-mail address.
(rcirc-mode-map): Remove M-o binding.
2011-04-05 Chong Yidong <cyd@stupidchicken.com>
* startup.el (command-line): Save the cursor's theme-face
directly, instead of using face-override-spec.
* custom.el (load-theme): Minor optimization in assigning faces.
2011-04-04 Juanma Barranquero <lekktu@gmail.com>
* help-fns.el (describe-variable): Complete all variables having
documentation, including keywords.
http://lists.gnu.org/archive/html/emacs-devel/2011-04/msg00112.html
2011-04-04 Juanma Barranquero <lekktu@gmail.com>
Convert to lexical-binding.
* bs.el (bs-refresh, bs-sort-buffer-interns-are-last)
(bs--get-marked-string, bs--get-modified-string)
(bs--get-readonly-string, bs--get-size-string, bs--get-name)
(bs--get-mode-name, bs--get-file-name): Mark unused arguments.
(bs--configuration-name-for-prefix-arg): Rename argument PREFIX-ARG.
* ehelp.el (electric-help-execute-extended)
(electric-help-ctrl-x-prefix):
* hexl.el (hexl-revert-buffer-function):
* linum.el (linum-after-change, linum-after-scroll):
* emacs-lisp/re-builder.el (reb-auto-update): Mark unused arguments.
* help-fns.el (help-describe-category-set): Remove unused ERR variable.
2011-04-04 Daiki Ueno <ueno@unixuser.org>
* epa-dired.el:
* epa-mail.el:
* epa-hook.el:
* epa-file.el:
* epa.el:
* epg.el: Use lexical binding.
2011-04-03 Chong Yidong <cyd@stupidchicken.com>
* dired-aux.el (dired-create-files): Add docstring (Bug#7970).
* textmodes/flyspell.el (flyspell-word): Recognize default
dictionary case for flyspell-mark-duplications-exceptions. Use
regexp matching for languages.
(flyspell-mark-duplications-exceptions): Add "that" and "had" for
default dictionary (Bug#7926).
2011-04-02 Chong Yidong <cyd@stupidchicken.com>
* emacs-lisp/package.el (package--with-work-buffer): Recognize
https URLs.
* net/network-stream.el: Move from gnus/proto-stream.el. Change
prefix to network-stream throughout.
(open-protocol-stream): Merge into open-network-stream, leaving
open-protocol-stream as an alias. Handle nil BUFFER args.
* subr.el (open-network-stream): Move to net/network-stream.el.
2011-04-02 Glenn Morris <rgm@gnu.org>
* find-dired.el (find-exec-terminator): New option.
(find-ls-option): Test for -ls support.
(find-ls-subdir-switches): Test for -b in find-ls-option.
(find-dired, find-grep-dired): Doc fixes.
(find-dired): Use find-exec-terminator.
* find-dired.el (find-ls-option, find-ls-subdir-switches)
(find-grep-options): Do not autoload these defcustoms, remove purecopy.
(find-name-arg): Remove purecopy.
* progmodes/grep.el (grep-find-use-xargs): Doc fix.
(grep-compute-defaults): Check for `-exec COMMAND +' support.
Set grep-find-use-xargs, grep-find-command, and grep-find-template
accordingly. Don't add the null-device if not needed.
* files.el (save-some-buffers): Doc fix.
2011-04-02 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (EMACS): Default to ../src/$(BLD)/emacs.exe.
2011-04-01 Juanma Barranquero <lekktu@gmail.com>
* progmodes/idlwave.el (idlwave-one-key-select, idlwave-list-abbrevs):
Use `dolist' rather than `mapcar'.
2011-04-01 Stefan Monnier <monnier@iro.umontreal.ca>
Add lexical binding.
...
...
@@ -182,14 +277,14 @@
* textmodes/css.el:
* startup.el:
* uniquify.el:
* minibuffer.el:
* newcomment.el:
* reveal.el:
* server.el:
* mpc.el:
* emacs-lisp/smie.el:
* doc-view.el:
* dired.el:
* minibuffer.el:
* newcomment.el:
* reveal.el:
* server.el:
* mpc.el:
* emacs-lisp/smie.el:
* doc-view.el:
* dired.el:
* abbrev.el: Use lexical binding.
2011-04-01 Eli Zaretskii <eliz@gnu.org>
...
...
@@ -203,7 +298,7 @@
2011-03-31 Tassilo Horn <tassilo@member.fsf.org>
* net/rcirc.el (rcirc-handler-001): Only authenticate, if there's
an entry for that server in rcirc-authinfo. (Bug#8385)
an entry for that server in rcirc-authinfo.
(Bug#8385)
2011-03-31 Glenn Morris <rgm@gnu.org>
...
...
lisp/bs.el
View file @
ca23cc88
;;; bs.el --- menu for selecting and displaying buffers
;;; bs.el --- menu for selecting and displaying buffers
-*- lexical-binding: t -*-
;; Copyright (C) 1998-2011 Free Software Foundation, Inc.
;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
...
...
@@ -693,7 +693,7 @@ Refresh whole Buffer Selection Menu."
(call-interactively 'bs-set-configuration)
(bs--redisplay t))
(defun bs-refresh (&rest ignored)
(defun bs-refresh (&rest
_
ignored)
"
Refresh
whole
Buffer
Selection
Menu.
Arguments
are
IGNORED
(
for
`
revert-buffer
'
)
.
"
(interactive)
...
...
@@ -1017,7 +1017,7 @@ A value of t means BUFFER belongs to no file.
A
value
of
nil
means
BUFFER
belongs
to
a
file.
"
(not (buffer-file-name buffer)))
(defun bs-sort-buffer-interns-are-last (b1 b2)
(defun bs-sort-buffer-interns-are-last (
_
b1 b2)
"
Function
for
sorting
internal
buffers
at
the
end
of
all
buffers.
"
(string-match-p "
^\\*
" (buffer-name b2)))
...
...
@@ -1262,7 +1262,7 @@ or a string."
fun)
(t (apply fun args))))
(defun bs--get-marked-string (start-buffer all-buffers)
(defun bs--get-marked-string (start-buffer
_
all-buffers)
"
Return
a
string
which
describes
whether
current
buffer
is
marked.
START-BUFFER
is
the
buffer
where
we
started
buffer
selection.
ALL-BUFFERS
is
the
list
of
buffers
appearing
in
Buffer
Selection
Menu.
...
...
@@ -1287,25 +1287,25 @@ The result string is one of `bs-string-current', `bs-string-current-marked',
(t
bs-string-show-always)))
(defun bs--get-modified-string (start-buffer all-buffers)
(defun bs--get-modified-string (
_
start-buffer
_
all-buffers)
"
Return
a
string
which
describes
whether
current
buffer
is
modified.
START-BUFFER
is
the
buffer
where
we
started
buffer
selection.
ALL-BUFFERS
is
the
list
of
buffers
appearing
in
Buffer
Selection
Menu.
"
(if (buffer-modified-p) "
*
" "
"))
(defun bs--get-readonly-string (start-buffer all-buffers)
(defun bs--get-readonly-string (
_
start-buffer
_
all-buffers)
"
Return
a
string
which
describes
whether
current
buffer
is
read
only.
START-BUFFER
is
the
buffer
where
we
started
buffer
selection.
ALL-BUFFERS
is
the
list
of
buffers
appearing
in
Buffer
Selection
Menu.
"
(if buffer-read-only "
%
" "
"))
(defun bs--get-size-string (start-buffer all-buffers)
(defun bs--get-size-string (
_
start-buffer
_
all-buffers)
"
Return
a
string
which
describes
the
size
of
current
buffer.
START-BUFFER
is
the
buffer
where
we
started
buffer
selection.
ALL-BUFFERS
is
the
list
of
buffers
appearing
in
Buffer
Selection
Menu.
"
(int-to-string (buffer-size)))
(defun bs--get-name (start-buffer all-buffers)
(defun bs--get-name (
_
start-buffer
_
all-buffers)
"
Return
name
of
current
buffer
for
Buffer
Selection
Menu.
The
name
of
current
buffer
gets
additional
text
properties
for
mouse
highlighting.
...
...
@@ -1315,13 +1315,13 @@ ALL-BUFFERS is the list of buffers appearing in Buffer Selection Menu."
'help-echo "
mouse-2:
select
this
buffer,
mouse-3:
select
in
other
frame
"
'mouse-face 'highlight))
(defun bs--get-mode-name (start-buffer all-buffers)
(defun bs--get-mode-name (start-buffer
_
all-buffers)
"
Return
the
name
of
mode
of
current
buffer
for
Buffer
Selection
Menu.
START-BUFFER
is
the
buffer
where
we
started
buffer
selection.
ALL-BUFFERS
is
the
list
of
buffers
appearing
in
Buffer
Selection
Menu.
"
(format-mode-line mode-name nil nil start-buffer))
(defun bs--get-file-name (start-buffer all-buffers)
(defun bs--get-file-name (
_
start-buffer
_
all-buffers)
"
Return
string
for
column
'File
'
in
Buffer
Selection
Menu.
This
is
the
variable
`
buffer-file-name
'
of
current
buffer.
If
not
visiting
a
file,
`
list-buffers-directory
'
is
returned
instead.
...
...
@@ -1420,18 +1420,18 @@ for buffer selection."
(bs-show-in-buffer liste)
(bs-message-without-log "
%s
" (bs--current-config-message)))))
(defun bs--configuration-name-for-prefix-arg (prefix
-arg
)
"
Convert
prefix
argument
PREFIX
-ARG
to
a
name
of
a
buffer
configuration.
If
PREFIX
-ARG
is
nil
return
`
bs-default-configuration
'.
If
PREFIX
-ARG
is
an
integer
return
PREFIX
-ARG
element
of
`
bs-configurations
'.
(defun bs--configuration-name-for-prefix-arg (prefix)
"
Convert
prefix
argument
PREFIX
to
a
name
of
a
buffer
configuration.
If
PREFIX
is
nil
return
`
bs-default-configuration
'.
If
PREFIX
is
an
integer
return
PREFIX
element
of
`
bs-configurations
'.
Otherwise
return
`
bs-alternative-configuration
'.
"
(cond ;; usually activation
((null prefix
-arg
)
((null prefix)
bs-default-configuration)
;; call with integer as prefix argument
((integerp prefix
-arg
)
(if (and (< 0 prefix
-arg
) (<= prefix
-arg
(length bs-configurations)))
(car (nth (1- prefix
-arg
) bs-configurations))
((integerp prefix)
(if (and (< 0 prefix) (<= prefix (length bs-configurations)))
(car (nth (1- prefix) bs-configurations))
bs-default-configuration))
;; call by prefix argument C-u
(t bs-alternative-configuration)))
...
...
lisp/custom.el
View file @
ca23cc88
...
...
@@ -1151,6 +1151,20 @@ Return t if THEME was successfully loaded, nil otherwise."
(
custom-theme-load-confirm
hash
))
(
let
((
custom--inhibit-theme-enable
t
))
(
eval-buffer
))
;; Optimization: if the theme changes the `default' face, put that
;; entry first. This avoids some `frame-set-background-mode' rigmarole
;; by assigning the new background immediately.
(
let*
((
settings
(
get
theme
'theme-settings
))
(
tail
settings
)
found
)
(
while
(
and
tail
(
not
found
))
(
and
(
eq
(
nth
0
(
car
tail
))
'theme-face
)
(
eq
(
nth
1
(
car
tail
))
'default
)
(
setq
found
(
car
tail
)))
(
setq
tail
(
cdr
tail
)))
(
if
found
(
put
theme
'theme-settings
(
cons
found
(
delq
found
settings
)))))
;; Finally, enable the theme.
(
unless
no-enable
(
enable-theme
theme
))
t
))))
...
...
lisp/dired-aux.el
View file @
ca23cc88
...
...
@@ -1363,33 +1363,28 @@ Special value `always' suppresses confirmation."
;; The basic function for half a dozen variations on cp/mv/ln/ln -s.
(
defun
dired-create-files
(
file-creator
operation
fn-list
name-constructor
&optional
marker-char
)
"Create one or more new files from a list of existing files FN-LIST.
This function also handles querying the user, updating Dired
buffers, and displaying a success or failure message.
;; Create a new file for each from a list of existing files. The user
;; is queried, dired buffers are updated, and at the end a success or
;; failure message is displayed
FILE-CREATOR should be a function. It is called once for each
file in FN-LIST, and must create a new file, querying the user
and updating Dired buffers as necessary. It should accept three
arguments: the old file name, the new name, and an argument
OK-IF-ALREADY-EXISTS with the same meaning as in `copy-file'.
;; FILE-CREATOR must accept three args: oldfile newfile ok-if-already-exists
OPERATION should be a capitalized string describing the operation
performed (e.g. `Copy'). It is used for error logging.
;; It is called for each file and must create newfile, the entry of
;; which will be added. The user will be queried if the file already
;; exists. If oldfile is removed by FILE-CREATOR (i.e, it is a
;; rename), it is FILE-CREATOR's responsibility to update dired
;; buffers. FILE-CREATOR must abort by signaling a file-error if it
;; could not create newfile. The error is caught and logged.
FN-LIST is the list of files to copy (full absolute file names).
;; OPERATION (a capitalized string, e.g. `Copy') describes the
;; operation performed. It is used for error logging.
;; FN-LIST is the list of files to copy (full absolute file names).
;; NAME-CONSTRUCTOR returns a newfile for every oldfile, or nil to
;; skip. If it skips files for other reasons than a direct user
;; query, it is supposed to tell why (using dired-log).
;; Optional MARKER-CHAR is a character with which to mark every
;; newfile's entry, or t to use the current marker character if the
;; oldfile was marked.
NAME-CONSTRUCTOR should be a function accepting a single
argument, the name of an old file, and returning either the
corresponding new file name or nil to skip.
Optional MARKER-CHAR is a character with which to mark every
newfile's entry, or t to use the current marker character if the
old file was marked."
(
let
(
dired-create-files-failures
failures
skipped
(
success-count
0
)
(
total
(
length
fn-list
)))
(
let
(
to
overwrite-query
...
...
lisp/dired.el
View file @
ca23cc88
...
...
@@ -3629,7 +3629,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown
;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
;;;;;; dired-diff) "
dired-aux
" "
dired-aux.el
" "
2d805d6766bd7970cd446413b4ed4ce0
")
;;;;;; dired-diff) "
dired-aux
" "
dired-aux.el
" "
0488aa71a7abdb8dcc9ce90201114ebc
")
;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "
dired-aux
" "
\
...
...
@@ -3766,7 +3766,7 @@ can be produced by `dired-get-marked-files', for example.
\(fn
COMMAND
&optional
ARG
FILE-LIST
)
" t nil)
(autoload 'dired-run-shell-command "
dired-aux
" "
\
Not
documented
\(fn
COMMAND
)
" nil nil)
...
...
@@ -3785,7 +3785,7 @@ command with a prefix argument (the value does not matter).
\(fn
&optional
ARG
FMT
)
" t nil)
(autoload 'dired-compress-file "
dired-aux
" "
\
Not
documented
\(fn
FILE
)
" nil nil)
...
...
@@ -3834,12 +3834,12 @@ See Info node `(emacs)Subdir switches' for more details.
\(fn
&optional
ARG
TEST-FOR-SUBDIR
)
" t nil)
(autoload 'dired-add-file "
dired-aux
" "
\
Not
documented
\(fn
FILENAME
&optional
MARKER-CHAR
)
" nil nil)
(autoload 'dired-remove-file "
dired-aux
" "
\
Not
documented
\(fn
FILE
)
" nil nil)
...
...
@@ -3849,12 +3849,12 @@ Create or update the line for FILE in all Dired buffers it would belong in.
\(fn
FILE
)
" nil nil)
(autoload 'dired-copy-file "
dired-aux
" "
\
Not
documented
\(fn
FROM
TO
OK-FLAG
)
" nil nil)
(autoload 'dired-rename-file "
dired-aux
" "
\
Not
documented
\(fn
FILE
NEWNAME
OK-IF-ALREADY-EXISTS
)
" nil nil)
...
...
lisp/ehelp.el
View file @
ca23cc88
;;; ehelp.el --- bindings for electric-help mode
;;; ehelp.el --- bindings for electric-help mode
-*- lexical-binding: t -*-
;; Copyright (C) 1986, 1995, 2000-2011 Free Software Foundation, Inc.
...
...
@@ -347,14 +347,14 @@ will select it.)"
;; This is to be bound to M-x in ehelp mode. Retains ehelp buffer and then
;; continues with execute-extended-command.
(
defun
electric-help-execute-extended
(
prefixarg
)
(
defun
electric-help-execute-extended
(
_
prefixarg
)
(
interactive
"p"
)
(
setq
electric-help-form-to-execute
'
(
execute-extended-command
nil
))
(
electric-help-retain
))
;; This is to be buond to C-x in ehelp mode. Retains ehelp buffer and then
;; continues with ctrl-x prefix.
(
defun
electric-help-ctrl-x-prefix
(
prefixarg
)
(
defun
electric-help-ctrl-x-prefix
(
_
prefixarg
)
(
interactive
"p"
)
(
setq
electric-help-form-to-execute
'
(
progn
(
message
nil
)
(
setq
unread-command-char
?\C-x
)))
(
electric-help-retain
))
...
...
lisp/emacs-lisp/package.el
View file @
ca23cc88
...
...
@@ -652,7 +652,7 @@ FILE is the name of a file relative to that base location.
This macro retrieves FILE from LOCATION into a temporary buffer,
and evaluates BODY while that buffer is current. This work
buffer is killed afterwards. Return the last value in BODY."
`
(
let*
((
http
(
string-match
"\\`http:"
,
location
))
`
(
let*
((
http
(
string-match
"\\`http
s?
:"
,
location
))
(
buffer
(
if
http
(
url-retrieve-synchronously
(
concat
,
location
,
file
))
...
...
lisp/emacs-lisp/re-builder.el
View file @
ca23cc88
;;; re-builder.el --- building Regexps with visual feedback
;;; re-builder.el --- building Regexps with visual feedback
-*- lexical-binding: t -*-
;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
...
...
@@ -506,7 +506,7 @@ If SUBEXP is non-nil mark only the corresponding sub-expressions."
(
reb-update-regexp
)
(
reb-update-overlays
subexp
))
(
defun
reb-auto-update
(
beg
end
lenold
&optional
force
)
(
defun
reb-auto-update
(
_
beg
_
end
_
lenold
&optional
force
)
"Called from `after-update-functions' to update the display.
BEG, END and LENOLD are passed in from the hook.
An actual update is only done if the regexp has changed or if the
...
...
lisp/epa-dired.el
View file @
ca23cc88
;;; epa-dired.el --- the EasyPG Assistant, dired extension
;;; epa-dired.el --- the EasyPG Assistant, dired extension
-*- lexical-binding: t -*-
;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
...
...
lisp/epa-file.el
View file @
ca23cc88
;;; epa-file.el --- the EasyPG Assistant, transparent file encryption
;;; epa-file.el --- the EasyPG Assistant, transparent file encryption
-*- lexical-binding: t -*-
;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
...
...
lisp/epa-hook.el
View file @
ca23cc88
;;; epa-hook.el --- preloaded code to enable epa-file.el
;;; epa-hook.el --- preloaded code to enable epa-file.el
-*- lexical-binding: t -*-
;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
...
...
lisp/epa-mail.el
View file @
ca23cc88
;;; epa-mail.el --- the EasyPG Assistant, minor-mode for mail composer
;;; epa-mail.el --- the EasyPG Assistant, minor-mode for mail composer
-*- lexical-binding: t -*-
;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
...
...
@@ -117,7 +117,7 @@ Don't use this command in Lisp programs!"
(
save-excursion
(
let
((
verbose
current-prefix-arg
)
(
context
(
epg-make-context
epa-protocol
))
recipients-string
recipients
recipient-key
)
recipients-string
recipients
recipient-key
sign
)
(
goto-char
(
point-min
))
(
save-restriction
(
narrow-to-region
(
point
)
...
...
lisp/epa.el
View file @
ca23cc88
;;; epa.el --- the EasyPG Assistant
;;; epa.el --- the EasyPG Assistant
-*- lexical-binding: t -*-
;; Copyright (C) 2006-2011 Free Software Foundation, Inc.
...
...
@@ -269,7 +269,7 @@ You should bind this variable with `let', but do not set it globally.")
:action
'epa--key-widget-action
:help-echo
'epa--key-widget-help-echo
)
(
defun
epa--key-widget-action
(
widget
&optional
event
)
(
defun
epa--key-widget-action
(
widget
&optional
_
event
)
(
save-selected-window
(
epa--show-key
(
widget-get
widget
:value
))))
...
...
@@ -460,7 +460,7 @@ If ARG is non-nil, mark the key."
(
list
nil
)))
(
epa--list-keys
name
t
))
(
defun
epa--key-list-revert-buffer
(
&optional
ignore-auto
noconfirm
)
(
defun
epa--key-list-revert-buffer
(
&optional
_
ignore-auto
_
noconfirm
)
(
apply
#'
epa--list-keys
epa-list-keys-arguments
))
(
defun
epa--marked-keys
()
...
...
@@ -490,13 +490,13 @@ If ARG is non-nil, mark the key."
-
`
\\[epa-mark-key]
'
to
mark
a
key
on
the
line
-
`
\\[epa-unmark-key]
'
to
unmark
a
key
on
the
line\n
"))
(widget-create 'link
:notify (lambda (&rest ignore) (abort-recursive-edit))
:notify (lambda (&rest
_
ignore) (abort-recursive-edit))
:help-echo
(substitute-command-keys
"
Click
here
or
\\[abort-recursive-edit]
to
cancel
")
"
Cancel
")
(widget-create 'link
:notify (lambda (&rest ignore) (exit-recursive-edit))
:notify (lambda (&rest
_
ignore) (exit-recursive-edit))
:help-echo
(substitute-command-keys
"
Click
here
or
\\[exit-recursive-edit]
to
finish
")
...
...
@@ -649,7 +649,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
(format "
Passphrase
for
%s
%s:
" key-id (cdr entry))
(format "
Passphrase
for
%s:
" key-id)))))))
(defun epa-progress-callback-function (context what char current total
(defun epa-progress-callback-function (
_
context what
_
char current total
handback)
(message "
%s%d%%
(
%d/%d
)
" (or handback
(concat what "
:
"))
...
...
@@ -964,7 +964,7 @@ See the reason described in the `epa-verify-region' documentation."
(eval-and-compile
(if (fboundp 'select-safe-coding-system)
(defalias 'epa--select-safe-coding-system 'select-safe-coding-system)
(defun epa--select-safe-coding-system (from to)
(defun epa--select-safe-coding-system (
_
from
_
to)
buffer-file-coding-system)))
;;;###autoload
...
...
lisp/epg.el
View file @
ca23cc88
;;; epg.el --- the EasyPG Library
;;; epg.el --- the EasyPG Library
-*- lexical-binding: t -*-
;; Copyright (C) 1999-2000, 2002-2011 Free Software Foundation, Inc.
;; Author: Daiki Ueno <ueno@unixuser.org>
...
...
@@ -1223,7 +1223,7 @@ This function is for internal use only."
(
defalias
'epg--decode-coding-string
'decode-coding-string
)
(
defalias
'epg--decode-coding-string
'identity
)))
(
defun
epg--status-USERID_HINT
(
context
string
)
(
defun
epg--status-USERID_HINT
(
_
context
string
)
(
if
(
string-match
"\\`\\([^ ]+\\) \\(.*\\)"
string
)
(
let*
((
key-id
(
match-string
1
string
))
(
user-id
(
match-string
2
string
))
...
...
@@ -1238,14 +1238,14 @@ This function is for internal use only."
(
setq
epg-user-id-alist
(
cons
(
cons
key-id
user-id
)
epg-user-id-alist
))))))
(
defun
epg--status-NEED_PASSPHRASE
(
context
string
)
(
defun
epg--status-NEED_PASSPHRASE
(
_
context
string
)
(
if
(
string-match
"\\`\\([^ ]+\\)"
string
)
(
setq
epg-key-id
(
match-string
1
string
))))
(
defun
epg--status-NEED_PASSPHRASE_SYM
(
context
string
)
(
defun
epg--status-NEED_PASSPHRASE_SYM
(
_
context
_
string
)
(
setq
epg-key-id
'SYM
))
(
defun
epg--status-NEED_PASSPHRASE_PIN
(
context
string
)
(
defun
epg--status-NEED_PASSPHRASE_PIN
(
_
context
_
string
)
(
setq
epg-key-id
'PIN
))
(
eval-and-compile
...
...
@@ -1308,11 +1308,11 @@ This function is for internal use only."
(
if
encoded-passphrase-with-new-line
(
epg--clear-string
encoded-passphrase-with-new-line
))))))
(
defun
epg--prompt-GET_BOOL
(
context
string
)
(
defun
epg--prompt-GET_BOOL
(
_
context
string
)
(
let
((
entry
(
assoc
string
epg-prompt-alist
)))
(
y-or-n-p
(
if
entry
(
cdr
entry
)
(
concat
string
"? "
)))))
(
defun
epg--prompt-GET_BOOL-untrusted_key.override
(
context
string
)
(
defun
epg--prompt-GET_BOOL-untrusted_key.override
(
_
context
_
string
)
(
y-or-n-p
(
if
(
and
(
equal
(
car
epg-last-status
)
"USERID_HINT"
)
(
string-match
"\\`\\([^ ]+\\) \\(.*\\)"
(
cdr
epg-last-status
)))
...
...
@@ -1467,31 +1467,31 @@ This function is for internal use only."
signature
(string-to-number (match-string 7 string) 16)))))
(defun epg--status-TRUST_UNDEFINED (context string)
(defun epg--status-TRUST_UNDEFINED (context
_
string)
(let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'good))
(epg-signature-set-validity signature 'undefined))))
(defun epg--status-TRUST_NEVER (context string)
(defun epg--status-TRUST_NEVER (context
_
string)
(let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'good))
(epg-signature-set-validity signature 'never))))
(defun epg--status-TRUST_MARGINAL (context string)
(defun epg--status-TRUST_MARGINAL (context
_
string)
(let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'marginal))
(epg-signature-set-validity signature 'marginal))))
(defun epg--status-TRUST_FULLY (context string)
(defun epg--status-TRUST_FULLY (context
_
string)
(let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'good))
(epg-signature-set-validity signature 'full))))
(defun epg--status-TRUST_ULTIMATE (context string)
(defun epg--status-TRUST_ULTIMATE (context
_
string)
(let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'good))
...
...
@@ -1541,10 +1541,10 @@ This function is for internal use only."
(string-to-number (match-string 3 string)))
(epg-context-result-for context 'encrypted-to)))))
(defun epg--status-DECRYPTION_FAILED (context string)
(defun epg--status-DECRYPTION_FAILED (context
_
string)
(epg-context-set-result-for context 'decryption-failed t))
(defun epg--status-DECRYPTION_OKAY (context string)
(defun epg--status-DECRYPTION_OKAY (context
_
string)
(epg-context-set-result-for context 'decryption-okay t))
(defun epg--status-NODATA (context string)
...
...
@@ -1566,13 +1566,13 @@ This function is for internal use only."
(epg--time-from-seconds string)))
(epg-context-result-for context 'error))))
(defun epg--status-KEYREVOKED (context string)
(defun epg--status-KEYREVOKED (context
_
string)
(epg-context-set-result-for
context 'key
(cons '(key-revoked)
(epg-context-result-for context 'error))))
(defun epg--status-BADARMOR (context string)
(defun epg--status-BADARMOR (context
_
string)
(epg-context-set-result-for
context 'error
(cons '(bad-armor)
...
...
@@ -1589,7 +1589,7 @@ This function is for internal use only."
(match-string 2 string)))
(epg-context-result-for context 'error)))))
(defun epg--status-NO_RECP (context string)
(defun epg--status-NO_RECP (context
_
string)
(epg-context-set-result-for
context 'error