aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Steingold2003-12-29 01:01:48 +0000
committerSam Steingold2003-12-29 01:01:48 +0000
commitc4383667201d2a2fa071c380caea36df2219261f (patch)
treea2393e1c17ab730f3753afada9d0030976dcd1a9
parentd674d13e14107bdc860391e08b724310f752235e (diff)
downloademacs-c4383667201d2a2fa071c380caea36df2219261f.tar.gz
emacs-c4383667201d2a2fa071c380caea36df2219261f.zip
(ange-ftp-file-attributes): Add new optional parameter ID-FORMAT.
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/net/ange-ftp.el4
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf4ae2b5828..56587ae22ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12003-12-28 Sam Steingold <sds@gnu.org>
2
3 * net/ange-ftp.el (ange-ftp-file-attributes): Add new optional
4 parameter ID-FORMAT to conform with the 2003-11-30 patch.
5
12003-12-28 Nick Roberts <nick@nick.uklinux.net> 62003-12-28 Nick Roberts <nick@nick.uklinux.net>
2 7
3 * progmodes/gud.el (gud-gdb-command-name): Set default to 8 * progmodes/gud.el (gud-gdb-command-name): Set default to
@@ -129,7 +134,7 @@
129 (group, documentation-string): Removed redundant (per 2003-10-25 134 (group, documentation-string): Removed redundant (per 2003-10-25
130 change) calls to `widget-children-value-delete'. 135 change) calls to `widget-children-value-delete'.
131 (widget-choice-value-get, widget-choice-value-inline): Removed 136 (widget-choice-value-get, widget-choice-value-inline): Removed
132 functions. 137 functions.
133 (menu-choice): Updated widget. 138 (menu-choice): Updated widget.
134 139
1352003-12-03 Kenichi Handa <handa@m17n.org> 1402003-12-03 Kenichi Handa <handa@m17n.org>
@@ -1905,7 +1910,7 @@
1905 which does not exist in LaTeX. 1910 which does not exist in LaTeX.
1906 (reftex-cite-format-builtin): Added amsrefs support. 1911 (reftex-cite-format-builtin): Added amsrefs support.
1907 (reftex-toc-confirm-promotion): New option 1912 (reftex-toc-confirm-promotion): New option
1908 1913
1909 * reftex-toc.el 1914 * reftex-toc.el
1910 (reftex-toc): Use `reftex-toc-split-windows-fraction'. 1915 (reftex-toc): Use `reftex-toc-split-windows-fraction'.
1911 (reftex-toc-demote, reftex-toc-promote) 1916 (reftex-toc-demote, reftex-toc-promote)
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 159b276716d..b96e7f1a298 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -3434,7 +3434,7 @@ system TYPE.")
3434 (nreverse files))) 3434 (nreverse files)))
3435 (apply 'ange-ftp-real-directory-files directory full match v19-args))) 3435 (apply 'ange-ftp-real-directory-files directory full match v19-args)))
3436 3436
3437(defun ange-ftp-file-attributes (file) 3437(defun ange-ftp-file-attributes (file &optional id-format)
3438 (setq file (expand-file-name file)) 3438 (setq file (expand-file-name file))
3439 (let ((parsed (ange-ftp-ftp-name file))) 3439 (let ((parsed (ange-ftp-ftp-name file)))
3440 (if parsed 3440 (if parsed
@@ -3467,7 +3467,7 @@ system TYPE.")
3467 inode ;10 "inode number". 3467 inode ;10 "inode number".
3468 -1 ;11 device number [v19 only] 3468 -1 ;11 device number [v19 only]
3469 )))) 3469 ))))
3470 (ange-ftp-real-file-attributes file)))) 3470 (ange-ftp-real-file-attributes file id-format))))
3471 3471
3472(defun ange-ftp-file-newer-than-file-p (f1 f2) 3472(defun ange-ftp-file-newer-than-file-p (f1 f2)
3473 (let ((f1-parsed (ange-ftp-ftp-name f1)) 3473 (let ((f1-parsed (ange-ftp-ftp-name f1))