Mercurial > hg > xemacs-beta
changeset 144:318232e2a3f0 r20-2b6
Import from CVS: tag r20-2b6
line wrap: on
line diff
--- a/CHANGES-beta Mon Aug 13 09:33:20 2007 +0200 +++ b/CHANGES-beta Mon Aug 13 09:34:14 2007 +0200 @@ -1,4 +1,10 @@ -*- indented-text -*- +to 20.2 beta6 +-- ediff-2.65 Courtesy of Michael Kifer +-- Gnus-5.4.52 +-- Miscellaneous bug fixes +-- W3-3.0.86 + to 20.2 beta5 -- Interface Changes: `allow-deletion-of-last-visible-frame' becomes a boolean
--- a/ChangeLog Mon Aug 13 09:33:20 2007 +0200 +++ b/ChangeLog Mon Aug 13 09:34:14 2007 +0200 @@ -1,3 +1,7 @@ +Sat May 10 16:14:30 1997 Steven L Baur <steve@altair.xemacs.org> + + * XEmacs 20.2-b6 is released. + Thu May 8 20:22:34 1997 Steven L Baur <steve@altair.xemacs.org> * XEmacs 20.2-b5 is released.
--- a/PROBLEMS Mon Aug 13 09:33:20 2007 +0200 +++ b/PROBLEMS Mon Aug 13 09:34:14 2007 +0200 @@ -7,7 +7,7 @@ in that task. Try finding the things you need using one of the search commands XEmacs provides (e.g. `C-s'). -(updated for 20.1) +(updated for 20.2) * Watch out for .emacs file @@ -155,16 +155,6 @@ even better, think of a better way to generate Makefile, and send us a patch. :-) -** CDE is not autodetected on HP. - -Richard Cognot <cognot@ensg.u-nancy.fr> writes: - I have to force /usr/dt/{lib,include} into the site include/lib - command line options. I could add these in hpux10.h, but then I - would think these should be pretty standard (to my knowledge, that's - also where Sun puts its CDE stuff), so that wouldn't fix the problem - on other architectures. AAMOF, when these path are given, CDE is - detected, and DragAndDrop works (more or less, see next issue). - ** Linking with -rpath on IRIX. Darrell Kindred <dkindred@cmu.edu> writes: @@ -1474,3 +1464,30 @@ The is seen when installing the Big Brother Data Base (bbdb) which includes an outdated copy of mail-abbrevs.el. Remove the copy that comes with bbdb and use the one that comes with XEmacs. + +* MULE issues + +** Internationalized (Asian) Isearch doesn't work + +Currently, Isearch doesn't directly support any of the input methods +that are not XIM based (like egg, canna and quail) (and there are +potential problems with XIM version too...). This is something +we are working on, but for the moment, if you're using egg there is a +workaround. Hitting <RET> right after C-s to invoke Isearch will put +Isearch in string mode, where a complete string can be typed into the +minibuffer and then processed by Isearch afterwards. Since egg is now +supported in the minibuffer using string mode you can now use egg to +input your Japanese, Korean or Chinese string, then hit return to send +that to Isearch and then use standard Isearch commands from there. + +** Using egg or canna and mousing around while in 'fence' mode screws +up my buffer + +Don't do this. The fence modes of egg and canna are currently very +modal, and messing with where they expect point to be and what they +think is the current buffer is just asking for trouble. If you're +lucky they will realize that something is awry, and simply delete the +fence, but worst case can trash other buffers too. We've tried to +protect against this where we can, but there still are many ways to +shoot yourself in the foot. So just finish what you are typing into +the fence before reaching for the mouse.
--- a/configure Mon Aug 13 09:33:20 2007 +0200 +++ b/configure Mon Aug 13 09:34:14 2007 +0200 @@ -4586,6 +4586,7 @@ if test -f `echo "${arg}/wnnerror.h" | sed 's/^\-I//'` ; then C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}" wnn_includes=${arg} + break fi done for arg in "-L${wnn_libraries}" "-L/usr/X11R6/lib" "-L/usr/lib" @@ -4593,6 +4594,7 @@ if test -f `echo "${arg}/libwnn.a" | sed 's/^\-L//'` ; then LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}" wnn_libraries=${arg} + break fi done fi @@ -4606,6 +4608,7 @@ if test -f `echo "${arg}/canna/RK.h" | sed 's/^\-I//'` ; then C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}" canna_includes=${arg} + break fi done for arg in "-L${canna_libraries}" "-L/usr/X11R6/lib" @@ -4613,6 +4616,7 @@ if test -f `echo "${arg}/libcanna.a" | sed 's/^\-L//'` ; then LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}" canna_libraries=${arg} + break fi done fi
--- a/configure.in Mon Aug 13 09:33:20 2007 +0200 +++ b/configure.in Mon Aug 13 09:34:14 2007 +0200 @@ -2678,6 +2678,7 @@ if test -f `echo "${arg}/wnnerror.h" | sed 's/^\-I//'` ; then C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}" wnn_includes=${arg} + break fi done for arg in "-L${wnn_libraries}" "-L/usr/X11R6/lib" "-L/usr/lib" @@ -2685,6 +2686,7 @@ if test -f `echo "${arg}/libwnn.a" | sed 's/^\-L//'` ; then LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}" wnn_libraries=${arg} + break fi done fi @@ -2698,6 +2700,7 @@ if test -f `echo "${arg}/canna/RK.h" | sed 's/^\-I//'` ; then C_SWITCH_SITE="${C_SWITCH_SITE} ${arg}" canna_includes=${arg} + break fi done for arg in "-L${canna_libraries}" "-L/usr/X11R6/lib" @@ -2705,6 +2708,7 @@ if test -f `echo "${arg}/libcanna.a" | sed 's/^\-L//'` ; then LD_SWITCH_SITE="${LD_SWITCH_SITE} ${arg}" canna_libraries=${arg} + break fi done fi
--- a/etc/NEWS Mon Aug 13 09:33:20 2007 +0200 +++ b/etc/NEWS Mon Aug 13 09:34:14 2007 +0200 @@ -185,7 +185,7 @@ ** A number of new packages are added, and many packages were updated. -** Gnus-5.4.50, courtesy of Lars Magne Ingebrigtsen +** Gnus-5.4.52, courtesy of Lars Magne Ingebrigtsen *** nntp.el has been totally rewritten in an asynchronous fashion. @@ -309,7 +309,7 @@ and how to add custom support to your Lisp packages. Custom is also documented in the XEmacs info manuals. -** W3-3.0.85, courtesy of William Perry +** W3-3.0.86, courtesy of William Perry Version 3 of Emacs/W3, the Emacs World Wide Web browser, has been included. It is significantly faster than any of the previous @@ -401,7 +401,7 @@ ** VM-6.30, courtesy of Kyle Jones ** OO-Browser-2.10, courtesy of Bob Weiner ** viper-2.93, courtesy of Michael Kifer -** ediff-2.64, courtesy of Michael Kifer +** ediff-2.65, courtesy of Michael Kifer ** detached-minibuf-1.1, courtesy of Alvin Shelton ** whitespace-mode.el, courtesy of Heiko Muenkel ** winmgr-mode.el, courtesy of David Konerding, Stefan Strobel & Barry Warsaw @@ -414,7 +414,7 @@ ** overlay.el, courtesy of Joseph Nuspl ** live-icon.el-1.3, fixes courtesy of Karl Hegbloom ** tpu-edt.el, fixes courtesy of R. Kevin Oberman -** etags.c-11.83 Courtesy of F. Potort́ +** etags.c-11.86 Courtesy of F. Potort́
--- a/etc/w3/stylesheet Mon Aug 13 09:33:20 2007 +0200 +++ b/etc/w3/stylesheet Mon Aug 13 09:34:14 2007 +0200 @@ -57,11 +57,13 @@ font-weight : bold; } +@media xemacs { h1 { font-size : +12pt } h2 { font-size : +6pt } h3 { font-size : +4pt } h5 { font-size : -2pt } h6 { font-size : -4pt } +} /* This causes problems with Emacs 19 */ @media xemacs { @@ -108,6 +110,7 @@ input:int, input:float, input:url, +input:password, input:text { text-decoration: underline; } input:submit { color: green; text-decoration: none; } input:reset { color: red; text-decoration: none; }
--- a/lisp/ChangeLog Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/ChangeLog Mon Aug 13 09:34:14 2007 +0200 @@ -1,8 +1,21 @@ +Fri May 9 10:41:44 1997 Steven L Baur <steve@altair.xemacs.org> + + * iso/iso-acc.el (iso-accents-compose): Fix XEmacs 19.14 + compatibility (patch suggested by Hrvoje Niksic). + + * packages/man.el (manual-entry): (Patch from Soren Dayton) Allow + subchapters not to be trimmed on Solaris. + + * prim/itimer.el (itimer-edit-mode): Correct use of obsolete + function. + + * prim/startup.el: Update copyright notice. + Thu May 8 14:35:34 1997 Steven L Baur <steve@altair.xemacs.org> * hm--html-menus/hm--html.el: Define obsolete aliases for the previous function spellings. -0 + * hm--html-menus/hm--html-keys.el: Define obsolete aliases for the previous variable spellings.
--- a/lisp/ediff/ediff-diff.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/ediff/ediff-diff.el Mon Aug 13 09:34:14 2007 +0200 @@ -586,13 +586,7 @@ (whitespace-C (ediff-whitespace-diff-region-p n 'C)) cumulative-fine-diff-length) - (cond ((and (eq flag 'noforce) (ediff-get-fine-diff-vector n 'A)) - ;; don't compute fine diffs if diff vector exists - (if (ediff-no-fine-diffs-p n) - ;;(ediff-message-if-verbose - (message - "Only white-space differences in region %d" (1+ n)))) - ;; If one of the regions is empty (or 2 in 3way comparison) + (cond ;; If one of the regions is empty (or 2 in 3way comparison) ;; then don't refine. ;; If the region happens to be entirely whitespace or empty then ;; mark as such. @@ -621,6 +615,20 @@ ;; if some regions are white and others don't, then mark as ;; non-white-space-only (ediff-mark-diff-as-space-only n nil))) + + ;; don't compute fine diffs if diff vector exists + ((and (eq flag 'noforce) (ediff-get-fine-diff-vector n 'A)) + (if (ediff-no-fine-diffs-p n) + (message + "Only white-space differences in region %d %s" + (1+ n) + (cond ((eq (ediff-no-fine-diffs-p n) 'A) + "in buffers B & C") + ((eq (ediff-no-fine-diffs-p n) 'B) + "in buffers A & C") + ((eq (ediff-no-fine-diffs-p n) 'C) + "in buffers A & B") + (t ""))))) ;; don't compute fine diffs for this region ((eq flag 'skip) (or (ediff-get-fine-diff-vector n 'A) @@ -701,13 +709,15 @@ (ediff-message-if-verbose "Only white-space differences in region %d" (1+ n))) ((eq cumulative-fine-diff-length 0) - (ediff-mark-diff-as-space-only n t) (ediff-message-if-verbose "Only white-space differences in region %d %s" (1+ n) - (cond (whitespace-A "in buffers B & C") - (whitespace-B "in buffers A & C") - (whitespace-C "in buffers A & B")))) + (cond (whitespace-A (ediff-mark-diff-as-space-only n 'A) + "in buffers B & C") + (whitespace-B (ediff-mark-diff-as-space-only n 'B) + "in buffers A & C") + (whitespace-C (ediff-mark-diff-as-space-only n 'C) + "in buffers A & B")))) (t (ediff-mark-diff-as-space-only n nil))) )
--- a/lisp/ediff/ediff-init.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/ediff/ediff-init.el Mon Aug 13 09:34:14 2007 +0200 @@ -129,10 +129,18 @@ (symbol-value (intern (format "ediff-difference-vector-%S" (, buf-type)))) (, n)))) -;; tell if it has been previously determined that the region has +;; Tell if it has been previously determined that the region has ;; no diffs other than the white space and newlines ;; The argument, N, is the diff region number used by Ediff to index the ;; diff vector. It is 1 less than the number seen by the user. +;; Returns: +;; t if the diffs are whitespace in all buffers +;; 'A (in 3-buf comparison only) if there are only whitespace +;; diffs in bufs B and C +;; 'B (in 3-buf comparison only) if there are only whitespace +;; diffs in bufs A and C +;; 'C (in 3-buf comparison only) if there are only whitespace +;; diffs in bufs A and B ;; ;; A difference vector has the form: ;; [diff diff diff ...]
--- a/lisp/ediff/ediff-util.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/ediff/ediff-util.el Mon Aug 13 09:34:14 2007 +0200 @@ -243,12 +243,11 @@ ;;; Setup functions -;; No longer needed: XEmacs has surrogate minibuffers now. -;;(or (boundp 'synchronize-minibuffers) -;; (defvar synchronize-minibuffers nil)) - -;; Common startup entry for all Ediff functions -;; It now returns control buffer so other functions can do post-processing +;; Common startup entry for all Ediff functions It now returns control buffer +;; so other functions can do post-processing SETUP-PARAMETERS is a list of the +;; form ((param .val) (param . val)...) This serves a similar purpose to +;; STARTUP-HOOKS, but these parameters are set in the new control buffer right +;; after this buf is created and before any windows are set and such. (defun ediff-setup (buffer-A file-A buffer-B file-B buffer-C file-C startup-hooks setup-parameters) ;; ediff-convert-standard-filename puts file names in the form appropriate @@ -264,12 +263,6 @@ (get-buffer-create control-buffer-name)))) (ediff-eval-in-buffer control-buffer (ediff-mode) - - ;; unwrap set up parameters passed as argument - (while setup-parameters - (set (car (car setup-parameters)) (cdr (car setup-parameters))) - (setq setup-parameters (cdr setup-parameters))) - ;; set variables classifying the current ediff job (setq ediff-3way-comparison-job (ediff-3way-comparison-job) ediff-merge-job (ediff-merge-job) @@ -287,6 +280,12 @@ (make-local-variable 'ediff-merge-window-share) (make-local-variable 'ediff-window-setup-function) (make-local-variable 'ediff-keep-variants) + + ;; unwrap set up parameters passed as argument + (while setup-parameters + (set (car (car setup-parameters)) (cdr (car setup-parameters))) + (setq setup-parameters (cdr setup-parameters))) + ;; Don't delete variants in case of ediff-buffer-* jobs without asking. ;; This is because u may loose work---dangerous. @@ -1593,7 +1592,7 @@ (or (ediff-get-state-of-merge n) ""))) ;; skip difference regions that differ in white space (and ediff-ignore-similar-regions - (ediff-no-fine-diffs-p n)))) + (eq (ediff-no-fine-diffs-p n) t)))) (setq n (1+ n)) (if (= 0 (mod n 20)) (message "Skipped over region %d and counting ..." n)) @@ -1630,7 +1629,7 @@ (or (ediff-get-state-of-merge n) ""))) ;; skip difference regions that differ in white space (and ediff-ignore-similar-regions - (ediff-no-fine-diffs-p n)))) + (eq (ediff-no-fine-diffs-p n) t)))) (if (= 0 (mod (1+ n) 20)) (message "Skipped over region %d and counting ..." (1+ n))) (setq n (1- n)) @@ -3132,9 +3131,11 @@ (ediff-regions-internal bufA begA endA bufB begB endB - nil ; startup hook + nil ; setup-hook 'ediff-regions-linewise ; job name - nil) ; no word mode + nil ; no word mode + ;; setup param to pass to ediff-setup + (list (cons 'ediff-split-window-function ediff-split-window-function))) ))
--- a/lisp/ediff/ediff-wind.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/ediff/ediff-wind.el Mon Aug 13 09:34:14 2007 +0200 @@ -908,7 +908,7 @@ fheight lines fwidth (max (+ (ediff-help-message-line-length) 2) (ediff-compute-toolbar-width)) - adjusted-parameters ;;(append + adjusted-parameters (list ;; possibly change surrogate minibuffer (cons 'minibuffer @@ -916,10 +916,6 @@ designated-minibuffer-frame)) (cons 'width fwidth) (cons 'height fheight)) - ;;(funcall - ;;ediff-control-frame-position-function - ;;ctl-buffer fwidth fheight) - ;;) ) (if ediff-use-long-help-message (setq adjusted-parameters
--- a/lisp/ediff/ediff.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/ediff/ediff.el Mon Aug 13 09:34:14 2007 +0200 @@ -6,8 +6,8 @@ ;; Created: February 2, 1994 ;; Keywords: comparing, merging, patching, version control. -(defconst ediff-version "2.64" "The current version of Ediff") -(defconst ediff-date "January 7, 1997" "Date of last update") +(defconst ediff-version "2.65" "The current version of Ediff") +(defconst ediff-date "May 1, 1997" "Date of last update") ;; This file is part of GNU Emacs. @@ -786,7 +786,7 @@ end-B (window-end)))) (ediff-regions-internal buffer-A beg-A end-A buffer-B beg-B end-B - startup-hooks job-name word-mode))) + startup-hooks job-name word-mode nil))) ;;;###autoload (defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks) @@ -823,7 +823,7 @@ (ediff-regions-internal (get-buffer buffer-A) reg-A-beg reg-A-end (get-buffer buffer-B) reg-B-beg reg-B-end - startup-hooks 'ediff-regions-wordwise 'word-mode))) + startup-hooks 'ediff-regions-wordwise 'word-mode nil))) ;;;###autoload (defun ediff-regions-linewise (buffer-A buffer-B &optional startup-hooks) @@ -883,7 +883,8 @@ ;; compare region beg-A to end-A of buffer-A ;; to regions beg-B -- end-B in buffer-B. (defun ediff-regions-internal (buffer-A beg-A end-A buffer-B beg-B end-B - startup-hooks job-name word-mode) + startup-hooks job-name word-mode + setup-parameters) (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer)) overl-A overl-B file-A file-B) @@ -934,9 +935,11 @@ (delete-file (, file-A)) (delete-file (, file-B)))) startup-hooks) - (list (cons 'ediff-word-mode word-mode) - (cons 'ediff-narrow-bounds (list overl-A overl-B)) - (cons 'ediff-job-name job-name)) + (append + (list (cons 'ediff-word-mode word-mode) + (cons 'ediff-narrow-bounds (list overl-A overl-B)) + (cons 'ediff-job-name job-name)) + setup-parameters) ) )) @@ -1151,7 +1154,7 @@ ;;;###autoload (defun run-ediff-from-cvs-buffer (pos) "Run Ediff-merge on appropriate revisions of the selected file. -First run after `M-x cvs-update'. Then place the cursor on a lide describing a +First run after `M-x cvs-update'. Then place the cursor on a line describing a file and then run `run-ediff-from-cvs-buffer'." (interactive "d") (ediff-load-version-control)
--- a/lisp/gnus/ChangeLog Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/gnus/ChangeLog Mon Aug 13 09:34:14 2007 +0200 @@ -1,8 +1,29 @@ +Sat May 10 00:37:32 1997 Lars Magne Ingebrigtsen <larsi@menja.ifi.uio.no> + + * gnus.el: Gnus v5.4.52 is released. + +Sat May 10 00:13:30 1997 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> + + * nnfolder.el (nnfolder-possibly-change-group): Set wrong + variable. + + * gnus-art.el (gnus-article-edit-article): Remove invisible text + under XEmacs. + (gnus-article-treat-html): Insert string. + Thu May 8 10:53:12 1997 Steven L Baur <steve@altair.xemacs.org> * gnus-msg.el (gnus-summary-mail-crosspost-complaint): `deactivate-mark' doesn't exist in XEmacs. +Fri May 9 23:50:01 1997 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> + + * gnus-topic.el (gnus-topic-create-topic): Added doc. + + * gnus-sum.el (gnus-summary-refer-article): Insert sparse + non-displayed articles properly. + (gnus-cut-thread): Exclude non-displayed sparse articles. + Thu May 8 17:37:38 1997 Lars Magne Ingebrigtsen <larsi@menja.ifi.uio.no> * gnus.el: Gnus v5.4.51 is released.
--- a/lisp/gnus/gnus-art.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/gnus/gnus-art.el Mon Aug 13 09:34:14 2007 +0200 @@ -1130,7 +1130,7 @@ (setq buf (buffer-string)))) (when buf (delete-region (point-min) (point-max)) - (insert-buffer-substring buf) + (insert buf) (kill-buffer buf)) (widen) (goto-char (point-min)) @@ -2464,7 +2464,7 @@ (let ((winconf (current-window-configuration))) (set-buffer gnus-article-buffer) (gnus-article-edit-mode) - (set-text-properties (point-min) (point-max) nil) + (gnus-set-text-properties (point-min) (point-max) nil) (gnus-configure-windows 'edit-article) (setq gnus-article-edit-done-function exit-func) (setq gnus-prev-winconf winconf)
--- a/lisp/gnus/gnus-sum.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/gnus/gnus-sum.el Mon Aug 13 09:34:14 2007 +0200 @@ -2014,7 +2014,7 @@ (defmacro gnus-summary-article-sparse-p (article) "Say whether this article is a sparse article or not." - ` (memq ,article gnus-newsgroup-sparse)) + `(memq ,article gnus-newsgroup-sparse)) (defmacro gnus-summary-article-ancient-p (article) "Say whether this article is a sparse article or not." @@ -5931,7 +5931,10 @@ (mail-header-number (car thread)))) (progn (if (<= (length (cdr thread)) 1) - (setq thread (cadr thread)) + (setq gnus-newsgroup-limit + (delq (mail-header-number (car thread)) + gnus-newsgroup-limit) + thread (cadr thread)) (when (gnus-invisible-cut-children (cdr thread)) (let ((th (cdr thread))) (while th @@ -5939,8 +5942,7 @@ gnus-newsgroup-limit) (setq thread (car th) th nil) - (setq th (cdr th))))))))) - )) + (setq th (cdr th))))))))))) thread) (defun gnus-cut-threads (threads) @@ -6156,8 +6158,13 @@ (let* ((header (gnus-id-to-header message-id)) (sparse (and header (gnus-summary-article-sparse-p - (mail-header-number header))))) - (if header + (mail-header-number header)) + (memq (mail-header-number header) + gnus-newsgroup-limit)))) + (if (and header + (or (not (gnus-summary-article-sparse-p + (mail-header-number header))) + sparse)) (prog1 ;; The article is present in the buffer, so we just go to it. (gnus-summary-goto-article
--- a/lisp/gnus/gnus-topic.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/gnus/gnus-topic.el Mon Aug 13 09:34:14 2007 +0200 @@ -1024,6 +1024,8 @@ (gnus-group-read-group all no-article group))) (defun gnus-topic-create-topic (topic parent &optional previous full-topic) + "Create a new TOPIC under PARENT. +When used interactively, PARENT will be the topic under point." (interactive (list (read-string "New topic: ")
--- a/lisp/gnus/gnus.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/gnus/gnus.el Mon Aug 13 09:34:14 2007 +0200 @@ -226,7 +226,7 @@ :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "5.4.51" +(defconst gnus-version-number "5.4.52" "Version number for this version of Gnus.") (defconst gnus-version (format "Gnus v%s" gnus-version-number)
--- a/lisp/gnus/nnfolder.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/gnus/nnfolder.el Mon Aug 13 09:34:14 2007 +0200 @@ -509,7 +509,7 @@ (if dont-check (setq nnfolder-current-group group - nnfolder-current-folder nil) + nnfolder-current-buffer nil) (let (inf file) ;; If we have to change groups, see if we don't already have the ;; folder in memory. If we do, verify the modtime and destroy
--- a/lisp/iso/iso-acc.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/iso/iso-acc.el Mon Aug 13 09:34:14 2007 +0200 @@ -6,8 +6,8 @@ ;; Maintainer: Alexandre Oliva <oliva@dcc.unicamp.br> ;; Keywords: i18n ;; Adapted to XEmacs 19.14 by Alexandre Oliva <oliva@dcc.unicamp.br> -;; $Revision: 1.3 $ -;; $Date: 1997/02/06 02:08:34 $ +;; $Revision: 1.4 $ +;; $Date: 1997/05/10 23:20:58 $ ;; This file is part of GNU Emacs. @@ -70,8 +70,10 @@ (provide 'iso-acc) ;; needed for compatibility with XEmacs 19.14 -(if (fboundp 'read-event) () - (defun read-event () (event-key (next-command-event)))) +(if (fboundp 'read-event) + (defalias 'iso-read-event 'read-event) + (defun iso-read-event () + (event-key (next-command-event)))) (if (fboundp 'character-to-event) (defun iso-char-to-event (ch) @@ -148,6 +150,7 @@ (?U . ?\331) (?a . ?\340) (?e . ?\350) (?i . ?\354) (?o . ?\362) (?u . ?\371) (?\ . ?`) (space . ?`))) + ;;; Thanks to Tudor <tudor@cs.unh.edu> for some fixes and additions. ("latin-2" (?' (?A . ?\301) (?C . ?\306) (?D . ?\320) (?E . ?\311) (?I . ?\315) (?L . ?\305) (?N . ?\321) (?O . ?\323) (?R . ?\300) (?S . ?\246) @@ -159,7 +162,8 @@ (?T . ?\336) (?Z . ?\257) (?a . ?\261) (?l . ?\263) (?c . ?\347) (?e . ?\352) (?s . ?\272) (?t . ?\376) (?z . ?\277) (?` . ?\252) (?. . ?\377) (?\ . ?`) (space . ?`)) - (?^ (?A . ?\302) (?O . ?\324) (?a . ?\342) (?o . ?\364) + (?^ (?A . ?\302) (?I . ?\316) (?O . ?\324) + (?a . ?\342) (?i . ?\356) (?o . ?\364) (?^ . ?^) ; no special code? (?\ . ?^) (space . ?^)) (?\" (?A . ?\304) (?E . ?\313) (?O . ?\326) (?U . ?\334) (?a . ?\344) @@ -167,7 +171,7 @@ (?\ . ?\") (space . ?\")) (?\~ (?A . ?\303) (?C . ?\310) (?D . ?\317) (?L . ?\245) (?N . ?\322) (?O . ?\325) (?R . ?\330) (?S . ?\251) (?T . ?\253) (?U . ?\333) - (?Z . ?\256) (?a . ?\323) (?c . ?\350) (?d . ?\357) (?l . ?\265) + (?Z . ?\256) (?a . ?\343) (?c . ?\350) (?d . ?\357) (?l . ?\265) (?n . ?\362) (?o . ?\365) (?r . ?\370) (?s . ?\271) (?t . ?\273) (?u . ?\373) (?z . ?\276) (?v . ?\242) ; v accent @@ -257,9 +261,9 @@ (message "%s%c" (or prompt "Compose with ") first-char) - (read-event)) + (iso-read-event)) (insert first-char) - (prog1 (read-event) + (prog1 (iso-read-event) (delete-region (1- (point)) (point))))) (entry (cdr (assq second-char list)))) (if entry
--- a/lisp/packages/man.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/packages/man.el Mon Aug 13 09:34:14 2007 +0200 @@ -60,6 +60,14 @@ ;; New variables. +(defcustom Manual-snip-subchapter + (not (string-match "solaris" system-configuration)) + "*Should man look in chapter 3 for ctime(3c)? +This is relavent for Solaris and, perhaps, other systems which have +`man -s 3' not find things in chapter 3c, or other such sub-chapters" + :type 'boolean + :group 'man) + (defcustom Manual-use-rosetta-man (not (null (locate-file "rman" exec-path))) "\ If non-nil, use RosettaMan (rman) to filter man pages. This makes man-page cleanup virtually instantaneous, instead of @@ -184,9 +192,10 @@ (setq section "-k" topic (substring topic (match-beginning 1)))))) - ;; jwz: turn section "3x11" and "3n" into "3". - (if (and section (string-match "\\`\\([0-9]+\\)[^0-9]" section)) - (setq section (substring section 0 (match-end 1)))) + (when Manual-snip-subchapter + ;; jwz: turn section "3x11" and "3n" into "3". + (if (and section (string-match "\\`\\([0-9]+\\)[^0-9]" section)) + (setq section (substring section 0 (match-end 1))))) (if (equal section "-k") (setq apropos-mode t))
--- a/lisp/packages/ps-print.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/packages/ps-print.el Mon Aug 13 09:34:14 2007 +0200 @@ -1125,7 +1125,7 @@ In either case, function or variable, the string value has PostScript string delimiters added to it." :type '(repeat (choice string symbol)) - :group ps-print-header) + :group 'ps-print-header) (make-variable-buffer-local 'ps-left-header) (defcustom ps-right-header @@ -1136,7 +1136,7 @@ See the variable `ps-left-header' for a description of the format of this variable." :type '(repeat (choice string symbol)) - :group ps-print-header) + :group 'ps-print-header) (make-variable-buffer-local 'ps-right-header) (defcustom ps-razzle-dazzle t
--- a/lisp/packages/vc.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/packages/vc.el Mon Aug 13 09:34:14 2007 +0200 @@ -1145,7 +1145,7 @@ scan the entire tree of subdirectories of the current directory." (interactive "DVC status of directory: \nP") (let* (nonempty - (dl (length dir)) + (dl (+ 1 (length (directory-file-name (expand-file-name dir))))) (filelist nil) (userlist nil) dired-buf (subfunction @@ -1155,7 +1155,7 @@ (and (or verbose user) (setq filelist (cons (substring f dl) filelist)) (setq userlist (cons user userlist))))))))) - (let ((default-directory dir)) + (let ((default-directory (expand-file-name dir))) (if nested (vc-file-tree-walk subfunction) (vc-dir-all-files subfunction)))
--- a/lisp/prim/about.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/prim/about.el Mon Aug 13 09:34:14 2007 +0200 @@ -1170,6 +1170,7 @@ Holger Franz <hfranz@physik.rwth-aachen.de> Benjamin Fried <bf@morgan.com> Barry Friedman <friedman@nortel.ca> + Noah Friedman <friedman@splode.com> Kazuyoshi Furutaka <furutaka@Flux.tokai.jaeri.go.jp> Lew Gaiter III <lew@StarFire.com> Itay Gat <itay@cs.huji.ac.il>
--- a/lisp/prim/auto-autoloads.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/prim/auto-autoloads.el Mon Aug 13 09:34:14 2007 +0200 @@ -3631,7 +3631,7 @@ ;;;### (autoloads (ksh-mode) "ksh-mode" "modes/ksh-mode.el") (autoload 'ksh-mode "ksh-mode" "\ -ksh-mode $Revision: 1.25 $ - Major mode for editing (Bourne, Korn or Bourne again) +ksh-mode $Revision: 1.26 $ - Major mode for editing (Bourne, Korn or Bourne again) shell scripts. Special key bindings and commands: \\{ksh-mode-map} @@ -4991,7 +4991,7 @@ (autoload 'vhdl-mode "vhdl-mode" "\ Major mode for editing VHDL code. -vhdl-mode $Revision: 1.25 $ +vhdl-mode $Revision: 1.26 $ To submit a problem report, enter `\\[vhdl-submit-bug-report]' from a vhdl-mode buffer. This automatically sets up a mail buffer with version information already added. You just need to add a description of the @@ -9600,7 +9600,16 @@ ;;;*** -;;;### (autoloads (w3-use-hotlist) "w3-hot" "w3/w3-hot.el") +;;;### (autoloads (w3-hotlist-add-document w3-use-hotlist w3-hotlist-append w3-hotlist-rename-entry w3-hotlist-delete) "w3-hot" "w3/w3-hot.el") + +(autoload 'w3-hotlist-delete "w3-hot" "\ +Deletes a document from your hotlist file" t nil) + +(autoload 'w3-hotlist-rename-entry "w3-hot" "\ +Rename a hotlist item" t nil) + +(autoload 'w3-hotlist-append "w3-hot" "\ +Append a hotlist to the one in memory" t nil) (autoload 'w3-use-hotlist "w3-hot" "\ Possibly go to a link in your W3/Mosaic hotlist. @@ -9608,6 +9617,9 @@ one of the items in your 'hotlist'. A hotlist is a list of often visited or interesting items you have found on the World Wide Web." t nil) +(autoload 'w3-hotlist-add-document "w3-hot" "\ +Add this documents url to the hotlist" t nil) + ;;;*** ;;;### (autoloads (w3-follow-link w3-follow-link-other-frame w3-do-setup w3 w3-preview-this-buffer w3-follow-url-at-point w3-follow-url-at-point-other-frame w3-maybe-follow-link w3-maybe-follow-link-mouse w3-fetch w3-fetch-other-frame w3-find-file w3-open-local) "w3" "w3/w3.el")
--- a/lisp/prim/custom-load.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/prim/custom-load.el Mon Aug 13 09:34:14 2007 +0200 @@ -277,5 +277,4 @@ (put 'w3-scripting 'custom-loads '("w3-script")) (put 'unix 'custom-loads '("rlogin" "shell" "sh-script")) (put 'x 'custom-loads '()) -(put 't 'custom-loads '("ps-print")) (put 'c 'custom-loads '("cc-mode" "cmacexp"))
--- a/lisp/prim/itimer.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/prim/itimer.el Mon Aug 13 09:34:14 2007 +0200 @@ -503,7 +503,7 @@ tab-stop-list '(22 32 40 60 67)) (abbrev-mode 0) (auto-fill-mode 0) - (buffer-flush-undo (current-buffer)) + (buffer-disable-undo (current-buffer)) (use-local-map itimer-edit-map) (set-syntax-table emacs-lisp-mode-syntax-table))
--- a/lisp/prim/minibuf.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/prim/minibuf.el Mon Aug 13 09:34:14 2007 +0200 @@ -371,7 +371,7 @@ (make-local-variable 'mode-motion-hook) (or mode-motion-hook ;;####disgusting - (setq mode-motion-hook 'minibuffer-mouse-tracker)) + (setq mode-motion-hook 'minibuffer-smart-mouse-tracker)) (make-local-variable 'mouse-track-click-hook) (add-hook 'mouse-track-click-hook 'minibuffer-smart-maybe-select-highlighted-completion))
--- a/lisp/prim/startup.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/prim/startup.el Mon Aug 13 09:34:14 2007 +0200 @@ -1,6 +1,6 @@ ;;; startup.el --- process XEmacs shell arguments -;; Copyright (C) 1985-1986, 1990, 1992-1995 Free Software Foundation, Inc. +;; Copyright (C) 1985-1986, 1990, 1992-1997 Free Software Foundation, Inc. ;; Copyright (c) 1993, 1994 Sun Microsystems, Inc. ;; Copyright (C) 1995 Board of Trustees, University of Illinois
--- a/lisp/version.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/version.el Mon Aug 13 09:34:14 2007 +0200 @@ -25,7 +25,7 @@ (defconst emacs-version "20.2" "Version numbers of this version of Emacs.") -(setq emacs-version (purecopy (concat emacs-version " XEmacs Lucid (beta5)"))) +(setq emacs-version (purecopy (concat emacs-version " XEmacs Lucid (beta6)"))) (defconst emacs-major-version (progn (or (string-match "^[0-9]+" emacs-version)
--- a/lisp/viper/viper.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/viper/viper.el Mon Aug 13 09:34:14 2007 +0200 @@ -2925,14 +2925,19 @@ (interactive "P") (vip-leave-region-active) (let ((val (vip-p-val arg)) - (com (vip-getcom arg))) + (com (vip-getcom arg)) + line-len) + (setq line-len (- (vip-line-pos 'end) (vip-line-pos 'start))) + (if com (vip-move-marker-locally 'vip-com-point (point))) + (beginning-of-line) + (forward-char (1- (min line-len val))) + (while (> (current-column) (1- val)) + (backward-char 1)) + (if com (vip-execute-com 'vip-goto-col val com)) (save-excursion (end-of-line) - (if (> val (1+ (current-column))) (error ""))) - (if com (vip-move-marker-locally 'vip-com-point (point))) - (beginning-of-line) - (forward-char (1- val)) - (if com (vip-execute-com 'vip-goto-col val com)))) + (if (> val (current-column)) (error ""))) + )) (defun vip-next-line (arg)
--- a/lisp/w3/ChangeLog Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/ChangeLog Mon Aug 13 09:34:14 2007 +0200 @@ -2,6 +2,44 @@ * Makefile (xemacs-w3): Special target for XEmacs Build. +Thu May 8 14:06:40 1997 William M. Perry <wmperry@aventail.com> + +* mule-sysdp.el (mule-code-convert-region): Try to deal gracefully with + the recent XEmacs 20.0 -> 20.2 renaming of the autodetect coding system + to automatic-conversion + +* w3-sysdp.el (event-point): New stub. + +* url-cookie.el (url-cookie-handle-set-cookie): Don't use the 'warn' + facility for bad cookie 'set' commands, was too annoying. + +* w3.el (w3-save-as): Make sure to require ps-print before trying to + save/mail a document as postscript. The local binding of + ps-spool-buffer-name was causing the defvar not to happen, and you would + get errors when trying to kill emacs later. Ugh. + (w3-document-information): Make sure to escape entities for meta and + other info we throw in. + +* url-file.el (url-file): ftp/file retrieval can now be asynchronous + through the magic of [ange-ftp|efs]-copy-file-internal + +* url.el (url-sentinel): Allow a buffer as the first argument to + the sentinel function. + (url-retrieve-internally): Allow asynch ftp transfers + +* url-file.el (url-file): Asynchronous ftp downloads work now. + +* w3.el (w3-download-url): Made this function interactive. + +Mon Apr 28 13:31:36 1997 William M. Perry <wmperry@aventail.com> + +* w3.el (w3-download-url-at-point): new function to download document + under point. + (w3-download-this-url): new function to download current document. + +* w3-vars.el (w3-mode-map): Added 'D' and 'd' bindings for starting + document downloads. + Thu Apr 24 08:29:34 1997 William M. Perry <wmperry@aventail.com> * Emacs/W3 3.0.85 released
--- a/lisp/w3/FAQ Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/FAQ Mon Aug 13 09:34:14 2007 +0200 @@ -16,6 +16,22 @@ emacs. Set the environment variable WIDGETDIR to where your custom library lives (ie: ~/lisp/gnus/lisp) +Q: W3 under OS/2 is incredibly slow +A: This appears to be a problem with how fonts are looked up. Thanks + to chang@wsu.edu for this analysis. + + In OS/2, the font name default to forms like + + "-*-Courier-medium-r-normal--*-100-*-*-m-*-cp850" ...... [1] + or + "10.Courier" + + In these two cases, font detection fails because this does not + match x-font-regexp. + + To solve this, set the default font as + "-*-Courier-medium-r-normal--*-100-*-*-m-*-cp850-1" + Q: I like being warned about invalid HTML on my own pages, but how can I make Emacs/W3 stop telling me almost everything on the Web is invalid?
--- a/lisp/w3/devices.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/devices.el Mon Aug 13 09:34:14 2007 +0200 @@ -1,7 +1,7 @@ ;;; devices.el -- XEmacs device API emulation ;; Author: wmperry -;; Created: 1997/04/22 14:48:02 -;; Version: 1.3 +;; Created: 1997/04/25 21:27:01 +;; Version: 1.4 ;; Keywords: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -31,6 +31,7 @@ ;; XEmacs 19.14. A 'device' for Emacs 19 is just a frame, from which we can ;; determine the connection to an X display, etc. +(require 'cl) (eval-when-compile (if (string-match "XEmacs" (emacs-version)) (set 'byte-optimize nil)))
--- a/lisp/w3/mule-sysdp.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/mule-sysdp.el Mon Aug 13 09:34:14 2007 +0200 @@ -75,7 +75,11 @@ (set-buffer-file-coding-system code))) (xemacs (if (and (listp code) (not (car code))) - (setq code 'automatic-conversion)) + (progn + (setq code 'autodetect) + (condition-case () + (get-coding-system 'autodetect) + (error (setq code 'automatic-conversion))))) (decode-coding-region (point-min) (point-max) code) (set-buffer-file-coding-system code)) (otherwise
--- a/lisp/w3/url-cookie.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/url-cookie.el Mon Aug 13 09:34:14 2007 +0200 @@ -1,7 +1,7 @@ ;;; url-cookie.el --- Netscape Cookie support ;; Author: wmperry -;; Created: 1997/04/11 14:41:18 -;; Version: 1.16 +;; Created: 1997/05/09 05:05:21 +;; Version: 1.17 ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -381,10 +381,7 @@ (url-cookie-store (car cur) (cdr cur) expires domain path secure)))) (t - (url-warn 'url (format - (concat "%s tried to set a cookie for domain %s\n" - "Permission denied - cookie rejected.\n" - "Set-Cookie: %s") - (url-host url-current-object) domain str)))))) + (message "%s tried to set a cookie for domain %s - rejected." + (url-host url-current-object) domain))))) (provide 'url-cookie)
--- a/lisp/w3/url-file.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/url-file.el Mon Aug 13 09:34:14 2007 +0200 @@ -1,7 +1,7 @@ ;;; url-file.el --- File retrieval code ;; Author: wmperry -;; Created: 1997/04/04 16:19:42 -;; Version: 1.16 +;; Created: 1997/05/09 04:39:15 +;; Version: 1.19 ;; Keywords: comm, data, processes ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -151,7 +151,34 @@ (substring (system-name) 0 (match-beginning 0)) (system-name))))))) - + +(defun url-file-build-continuation (name) + (list 'url-file-asynch-callback + name (current-buffer) + url-current-callback-func url-current-callback-data)) + +(defun url-file-asynch-callback (x y name buff func args &optional efs) + (if (featurep 'efs) + ;; EFS passes us an extra argument + (setq name buff + buff func + func args + args efs)) + (cond + ((not name) nil) + ((not (file-exists-p name)) nil) + (t + (if (not buff) + (setq buff (generate-new-buffer " *url-asynch-file*"))) + (set-buffer buff) + (insert-file-contents-literally name) + (condition-case () + (delete-file name) + (error nil)))) + (if func + (apply func args) + (url-sentinel (current-buffer) nil))) + (defun url-file (url) ;; Find a file (let* ((urlobj (url-generic-parse-url url)) @@ -175,15 +202,13 @@ nil))) (cond ((file-directory-p filename) - (if (string-match "/$" filename) - nil - (setq filename (concat filename "/"))) - (if (string-match "/$" file) - nil - (setq file (concat file "/"))) + (if (not (string-match "/$" filename)) + (setq filename (concat filename "/"))) + (if (not (string-match "/$" file)) + (setq file (concat file "/"))) (url-set-filename urlobj file) (url-format-directory filename)) - ((and (boundp 'w3-dump-to-disk) (symbol-value 'w3-dump-to-disk)) + (url-be-asynchronous (cond ((file-exists-p filename) nil) ((file-exists-p (concat filename ".Z")) @@ -192,31 +217,29 @@ (setq filename (concat filename ".gz"))) ((file-exists-p (concat filename ".z")) (setq filename (concat filename ".z"))) - (t - (error "File not found %s" filename))) - (cond - ((url-host-is-local-p site) - (copy-file - filename - (read-file-name "Save to: " nil (url-basepath filename t)) t)) - ((featurep 'ange-ftp) - (ange-ftp-copy-file-internal - filename - (expand-file-name - (read-file-name "Save to: " nil (url-basepath filename t))) t - nil t nil t)) - ((or (featurep 'efs) (featurep 'efs-auto)) - (let ((new (expand-file-name - (read-file-name "Save to: " nil - (url-basepath filename t))))) + (t nil)) + (let ((new (mm-generate-unique-filename))) + (cond + ((url-host-is-local-p site) + (insert-file-contents-literally filename) + (if (featurep 'efs) + (url-file-asynch-callback nil nil nil nil nil + url-current-callback-func + url-current-callback-data) + (url-file-asynch-callback nil nil nil nil + url-current-callback-func + url-current-callback-data))) + ((featurep 'ange-ftp) + (ange-ftp-copy-file-internal filename (expand-file-name new) t + nil t + (url-file-build-continuation new) + t)) + ((or (featurep 'efs) (featurep 'efs-auto)) (efs-copy-file-internal filename (efs-ftp-path filename) new (efs-ftp-path new) - t nil 0 nil 0 nil))) - (t (copy-file - filename - (read-file-name "Save to: " nil (url-basepath filename t)) t))) - (if (get-buffer url-working-buffer) - (kill-buffer url-working-buffer))) + t nil 0 + (url-file-build-continuation new) + 0 nil))))) (t (let ((viewer (mm-mime-info (mm-extension-to-mime (url-file-extension file))))
--- a/lisp/w3/url-vars.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/url-vars.el Mon Aug 13 09:34:14 2007 +0200 @@ -1,7 +1,7 @@ ;;; url-vars.el --- Variables for Uniform Resource Locator tool ;; Author: wmperry -;; Created: 1997/04/24 20:22:16 -;; Version: 1.57 +;; Created: 1997/05/09 06:21:56 +;; Version: 1.58 ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -38,7 +38,7 @@ (defmacro defcustom (var value doc &rest args) (` (defvar (, var) (, value) (, doc)))))) -(defconst url-version (let ((x "p3.0.85")) +(defconst url-version (let ((x "p3.0.86")) (if (string-match "State: \\([^ \t\n]+\\)" x) (substring x (match-beginning 1) (match-end 1)) x))
--- a/lisp/w3/url.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/url.el Mon Aug 13 09:34:14 2007 +0200 @@ -1,13 +1,13 @@ ;;; url.el --- Uniform Resource Locator retrieval tool ;; Author: wmperry -;; Created: 1997/04/22 15:08:38 -;; Version: 1.76 +;; Created: 1997/05/08 22:17:40 +;; Version: 1.78 ;; Keywords: comm, data, processes, hypermedia ;;; LCD Archive Entry: ;;; url|William M. Perry|wmperry@cs.indiana.edu| ;;; Functions for retrieving/manipulating URLs| -;;; 1997/04/22 15:08:38|1.76|Location Undetermined +;;; 1997/05/08 22:17:40|1.78|Location Undetermined ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1356,7 +1356,7 @@ (message "Retrieval for %s complete." buf)))) (defun url-sentinel (proc string) - (let* ((buf (process-buffer proc)) + (let* ((buf (if (processp proc) (process-buffer proc) proc)) (url-working-buffer (and buf (get-buffer buf))) status) (if (not url-working-buffer) @@ -1372,10 +1372,12 @@ ((url-mime-response-p) (setq status (url-parse-mime-headers)))) (if (not url-current-mime-type) - (setq url-current-mime-type (mm-extension-to-mime - (url-file-extension - (url-filename - url-current-object)))))))) + (setq url-current-mime-type (or + (mm-extension-to-mime + (url-file-extension + (url-filename + url-current-object))) + "text/plain")))))) (if (member status '(401 301 302 303 204)) nil (funcall url-default-retrieval-proc (buffer-name url-working-buffer))))) @@ -1957,7 +1959,7 @@ "<address>" url-bug-address "</address>")) (cond ((and url-be-asynchronous (not cached) - (member type '("http" "https" "proxy"))) + (member type '("http" "https" "proxy" "file" "ftp"))) nil) ((and url-be-asynchronous (get-buffer url-working-buffer)) (funcall url-default-retrieval-proc (buffer-name))) @@ -1969,12 +1971,10 @@ (not (equal type "http"))) url-current-object (not url-current-mime-type)) - (if (url-buffer-is-hypertext) - (setq url-current-mime-type "text/html") - (setq url-current-mime-type (mm-extension-to-mime - (url-file-extension - (url-filename - url-current-object)))))) + (setq url-current-mime-type (mm-extension-to-mime + (url-file-extension + (url-filename + url-current-object))))) (if (not url-be-asynchronous) (url-store-in-cache url-working-buffer)) (if (not url-global-history-hash-table)
--- a/lisp/w3/w3-hot.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/w3-hot.el Mon Aug 13 09:34:14 2007 +0200 @@ -1,7 +1,7 @@ ;;; w3-hot.el --- Main functions for emacs-w3 on all platforms/versions ;; Author: wmperry -;; Created: 1997/03/11 15:04:05 -;; Version: 1.13 +;; Created: 1997/05/09 04:30:54 +;; Version: 1.14 ;; Keywords: faces, help, comm, news, mail, processes, mouse, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -175,6 +175,7 @@ (if (eq (assoc x alist) (car alist)) (cdr alist) (delq (assoc x alist) alist))) +;;;###autoload (defun w3-hotlist-delete () "Deletes a document from your hotlist file" (interactive) @@ -206,6 +207,7 @@ (kill-buffer (current-buffer))) (message "%s was not found in %s" title w3-hotlist-file))))))) +;;;###autoload (defun w3-hotlist-rename-entry (title) "Rename a hotlist item" (interactive (list (let ((completion-ignore-case t)) @@ -248,6 +250,7 @@ (w3-build-FSF19-menu)))) (message "%s was not found in %s" title w3-hotlist-file))))) +;;;###autoload (defun w3-hotlist-append (fname) "Append a hotlist to the one in memory" (interactive "fAppend hotlist file: ") @@ -326,6 +329,7 @@ (widget-get widget :to)))) (w3-hotlist-add-document pref-arg (or title url) url))) +;;;###autoload (defun w3-hotlist-add-document (pref-arg &optional the-title the-url) "Add this documents url to the hotlist" (interactive "P")
--- a/lisp/w3/w3-sysdp.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/w3-sysdp.el Mon Aug 13 09:34:14 2007 +0200 @@ -280,7 +280,12 @@ (sysdep-defalias 'x-display-grayscale-p 'x-grayscale-display-p) (sysdep-defalias 'menu-event-p 'misc-user-event-p) -;; WMP - commention these out so that Emacs 19 doesn't get screwed by them. +(sysdep-defun event-point (event) + (let ((posn (event-end event))) + (if posn + (posn-point posn)))) + +;; WMP - commenting these out so that Emacs 19 doesn't get screwed by them. ;; In particular, this makes the 'custom' package blow up quite well. ;;(sysdep-defun add-submenu (menu-path submenu &optional before) ;; "Add a menu to the menubar or one of its submenus.
--- a/lisp/w3/w3-vars.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/w3-vars.el Mon Aug 13 09:34:14 2007 +0200 @@ -1,7 +1,7 @@ ;;; w3-vars.el,v --- All variable definitions for emacs-w3 ;; Author: wmperry -;; Created: 1997/04/24 20:22:16 -;; Version: 1.127 +;; Created: 1997/05/09 06:21:55 +;; Version: 1.129 ;; Keywords: comm, help, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -33,7 +33,7 @@ (require 'w3-cus) ; Grab everything that is customized (defconst w3-version-number - (let ((x "p3.0.85")) + (let ((x "p3.0.86")) (if (string-match "State:[ \t\n]+.\\([^ \t\n]+\\)" x) (setq x (substring x (match-beginning 1) (match-end 1))) (setq x (substring x 1))) @@ -41,7 +41,7 @@ (function (lambda (x) (if (= x ?-) "." (char-to-string x)))) x "")) "Version # of w3-mode.") -(defconst w3-version-date (let ((x "1997/04/24 20:22:16")) +(defconst w3-version-date (let ((x "1997/05/09 06:21:55")) (if (string-match "Date: \\([^ \t\n]+\\)" x) (substring x (match-beginning 1) (match-end 1)) x)) @@ -528,6 +528,7 @@ (define-key w3-mode-map ">" 'end-of-buffer) (define-key w3-mode-map "?" 'w3-help) (define-key w3-mode-map "B" 'w3-history-backward) +(define-key w3-mode-map "D" 'w3-download-url-at-point) (define-key w3-mode-map "F" 'w3-history-forward) (define-key w3-mode-map "G" 'w3-show-graphics) (define-key w3-mode-map "I" 'w3-popup-info) @@ -550,6 +551,7 @@ (define-key w3-mode-map "\n" 'w3-widget-button-press) (define-key w3-mode-map "b" 'w3-widget-backward) (define-key w3-mode-map "c" 'w3-mail-document-author) +(define-key w3-mode-map "d" 'w3-download-this-url) (define-key w3-mode-map "f" 'w3-widget-forward) (define-key w3-mode-map "g" 'w3-reload-document) (define-key w3-mode-map "i" 'w3-document-information)
--- a/lisp/w3/w3.el Mon Aug 13 09:33:20 2007 +0200 +++ b/lisp/w3/w3.el Mon Aug 13 09:34:14 2007 +0200 @@ -1,7 +1,7 @@ ;;; w3.el --- Main functions for emacs-w3 on all platforms/versions ;; Author: wmperry -;; Created: 1997/04/21 23:55:57 -;; Version: 1.112 +;; Created: 1997/05/09 04:54:28 +;; Version: 1.119 ;; Keywords: faces, help, comm, news, mail, processes, mouse, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -619,6 +619,7 @@ ((equal '(0 . 0) lastmod) (setq lastmod possible-lastmod)) ((consp lastmod) (setq lastmod (current-time-string lastmod))) (t (setq lastmod possible-lastmod))) + (setq url-current-mime-type "text/html") (insert "<html>\n" " <head>\n" " <title>Document Information</title>\n" @@ -646,10 +647,12 @@ (lambda (x) (if (/= (length (car x)) 0) (format fmtstring - (capitalize (car x)) - (if (numberp (cdr x)) - (int-to-string (cdr x)) - (cdr x)))))) + (url-insert-entities-in-string + (capitalize (car x))) + (url-insert-entities-in-string + (if (numberp (cdr x)) + (int-to-string (cdr x)) + (cdr x))))))) (sort hdrs (function (lambda (x y) (string-lessp (car x) (car y))))) @@ -666,8 +669,11 @@ (fmtstring (format " <tr><td>%%%ds:</td><td>%%s</td></tr>" maxlength))) (insert " <tr><th>Miscellaneous Variables</th></tr>\n") (while info - (insert (format fmtstring (capitalize (caar info)) - (cdar info)) "\n") + (insert (format fmtstring + (url-insert-entities-in-string + (capitalize (caar info))) + (url-insert-entities-in-string + (cdar info))) "\n") (setq info (cdr info)) ) ) @@ -894,12 +900,14 @@ ((and under (equal "PostScript" format)) (setq content-type "application/postscript") (w3-fetch url) + (require 'ps-print) (let ((ps-spool-buffer-name " *w3-temp*")) (if (get-buffer ps-spool-buffer-name) (kill-buffer ps-spool-buffer-name)) (ps-spool-buffer-with-faces) (set-buffer ps-spool-buffer-name))) ((equal "PostScript" format) + (require 'ps-print) (let ((ps-spool-buffer-name " *w3-temp*")) (if (get-buffer ps-spool-buffer-name) (kill-buffer ps-spool-buffer-name)) @@ -1190,6 +1198,7 @@ (equal "" format)) nil) ; Do nothing - we have the text already ((equal "PostScript" format) + (require 'ps-print) (let ((ps-spool-buffer-name " *w3-temp*")) (if (get-buffer ps-spool-buffer-name) (kill-buffer ps-spool-buffer-name)) @@ -2084,7 +2093,25 @@ (sit-for 3) (kill-buffer buff))))) +(defun w3-download-url-at-point () + "Download the URL under point." + (interactive) + (w3-download-url-wrapper t)) + +(defun w3-download-this-url () + "Download the current URL." + (interactive) + (w3-download-url-wrapper nil)) + +(defun w3-download-url-wrapper (under-pt) + "Download current URL." + (let ((x (if under-pt (w3-view-this-url t) (url-view-url t)))) + (if x + (w3-download-url x) + (error "No link found.")))) + (defun w3-download-url (url) + (interactive (list (w3-read-url-with-default))) (let* ((old-asynch url-be-asynchronous) (url-inhibit-uncompression t) (url-mime-accept-string "*/*")
--- a/man/gnus.texi Mon Aug 13 09:33:20 2007 +0200 +++ b/man/gnus.texi Mon Aug 13 09:34:14 2007 +0200 @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Gnus 5.4.51 Manual +@settitle Gnus 5.4.52 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -287,7 +287,7 @@ @tex @titlepage -@title Gnus 5.4.51 Manual +@title Gnus 5.4.52 Manual @author by Lars Magne Ingebrigtsen @page @@ -323,7 +323,7 @@ spool or your mbox file. All at the same time, if you want to push your luck. -This manual corresponds to Gnus 5.4.51. +This manual corresponds to Gnus 5.4.52. @end ifinfo @@ -5236,7 +5236,7 @@ these group names before creating the file name to save to. The following will do just that: -1@lisp +@lisp (defun my-save-name (group) (when (string-match "^nnml:mail." group) (substring group (match-end 0))))
--- a/man/message.texi Mon Aug 13 09:33:20 2007 +0200 +++ b/man/message.texi Mon Aug 13 09:34:14 2007 +0200 @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Message 5.4.51 Manual +@settitle Message 5.4.52 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -39,7 +39,7 @@ @tex @titlepage -@title Message 5.4.51 Manual +@title Message 5.4.52 Manual @author by Lars Magne Ingebrigtsen @page @@ -79,7 +79,7 @@ * Key Index:: List of Message mode keys. @end menu -This manual corresponds to Message 5.4.51. Message is distributed with +This manual corresponds to Message 5.4.52. Message is distributed with the Gnus distribution bearing the same version number as this manual has.