projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ssl.el discussion.
[gnus]
/
lisp
/
nnmaildir.el
diff --git
a/lisp/nnmaildir.el
b/lisp/nnmaildir.el
index
c1abf28
..
2a8f885
100644
(file)
--- a/
lisp/nnmaildir.el
+++ b/
lisp/nnmaildir.el
@@
-17,8
+17,8
@@
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-;; Boston, MA 0211
1-1307
, USA.
+;; Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+;; Boston, MA 0211
0-1301
, USA.
;;; Commentary:
;;; Commentary:
@@
-1030,7
+1030,7
@@
by nnmaildir-request-article.")
(throw 'return nil))
(when (save-match-data (string-match "[\0/\t]" gname))
(setf (nnmaildir--srv-error nnmaildir--cur-server)
(throw 'return nil))
(when (save-match-data (string-match "[\0/\t]" gname))
(setf (nnmaildir--srv-error nnmaildir--cur-server)
- (concat "I
llegal
characters (null, tab, or /) in group name: "
+ (concat "I
nvalid
characters (null, tab, or /) in group name: "
gname))
(throw 'return nil))
(setq groups (nnmaildir--srv-groups nnmaildir--cur-server))
gname))
(throw 'return nil))
(setq groups (nnmaildir--srv-groups nnmaildir--cur-server))
@@
-1075,7
+1075,7
@@
by nnmaildir-request-article.")
(throw 'return nil))
(when (save-match-data (string-match "[\0/\t]" new-name))
(setf (nnmaildir--srv-error nnmaildir--cur-server)
(throw 'return nil))
(when (save-match-data (string-match "[\0/\t]" new-name))
(setf (nnmaildir--srv-error nnmaildir--cur-server)
- (concat "I
llegal
characters (null, tab, or /) in group name: "
+ (concat "I
nvalid
characters (null, tab, or /) in group name: "
new-name))
(throw 'return nil))
(if (string-equal gname new-name) (throw 'return t))
new-name))
(throw 'return nil))
(if (string-equal gname new-name) (throw 'return t))
@@
-1305,7
+1305,7
@@
by nnmaildir-request-article.")
t)))
(defun nnmaildir-request-move-article (article gname server accept-form
t)))
(defun nnmaildir-request-move-article (article gname server accept-form
- &optional last)
+ &optional last
move-is-internal
)
(let ((group (nnmaildir--prepare server gname))
pgname suffix result nnmaildir--file deactivate-mark)
(catch 'return
(let ((group (nnmaildir--prepare server gname))
pgname suffix result nnmaildir--file deactivate-mark)
(catch 'return
@@
-1395,8
+1395,9
@@
by nnmaildir-request-article.")
(write-region (point-min) (point-max) tmpfile nil 'no-message nil
'excl)
(unix-sync))) ;; no fsync :(
(write-region (point-min) (point-max) tmpfile nil 'no-message nil
'excl)
(unix-sync))) ;; no fsync :(
- (cancel-timer 24h)
- (condition-case err (add-name-to-file tmpfile curfile)
+ (nnheader-cancel-timer 24h)
+ (condition-case err
+ (add-name-to-file tmpfile curfile)
(error
(setf (nnmaildir--srv-error nnmaildir--cur-server)
(concat "Error linking: " (prin1-to-string err)))
(error
(setf (nnmaildir--srv-error nnmaildir--cur-server)
(concat "Error linking: " (prin1-to-string err)))