Mercurial > hg > xemacs-beta
changeset 4558:d9fcb5442c95
Automated merge with file:/Sources/xemacs-21.5-checked-out
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 21 May 2008 21:47:42 +0200 |
| parents | 790bd95b84c1 (current diff) 23ef20edf6ba (diff) |
| children | bd1a68c34d44 |
| files | lisp/ChangeLog lisp/mule/mule-coding.el |
| diffstat | 12 files changed, 105 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Tue May 13 20:26:47 2008 +0200 +++ b/lib-src/ChangeLog Wed May 21 21:47:42 2008 +0200 @@ -1,3 +1,13 @@ +2008-05-21 Aidan Kehoe <kehoea@parhasard.net> + + * make-mswin-unicode.pl: + Check %WindowsSdkDir%, %MSSddk% for the Windows header files too. + +2008-05-14 Vin Shelton <acs@xemacs.org> + + * winclient.c: Create CONNECT_RETRIES and increase retry count + from 5 to 10. + 2008-05-13 Aidan Kehoe <kehoea@parhasard.net> * make-docfile.c (scan_file):
--- a/lib-src/make-mswin-unicode.pl Tue May 13 20:26:47 2008 +0200 +++ b/lib-src/make-mswin-unicode.pl Wed May 21 21:47:42 2008 +0200 @@ -104,7 +104,17 @@ $options{"includedir"}); if (!$dir) { - $dir=$ENV{"MSVCDIR"} or die "Environment variable MSVCDIR undefined - run vcvars32.bat from your MSVC installation"; + for my $sdkroot (("WindowsSdkDir", "MSSdk", "MSVCDIR")) + { + if (defined $ENV{$sdkroot}) { + $dir = $ENV{$sdkroot}; + last; + } + } + unless (defined $dir) + { + die "Can't find the Windows SDK headers; run vcvars32.bat from your MSVC installation, or setenv.cmd from the Platform SDK installation"; + } $dir.='/include'; } die "Can't find MSVC include files in \"$dir\"" unless ((-f $dir.'/WINDOWS.H') || (-f $dir.'/windows.h'));
--- a/lib-src/winclient.c Tue May 13 20:26:47 2008 +0200 +++ b/lib-src/winclient.c Wed May 21 21:47:42 2008 +0200 @@ -40,6 +40,7 @@ /* -- Post-Include Defines -------------------------------------------------- */ /* Timeouts & delays */ +#define CONNECT_RETRIES 10 #define CONNECT_DELAY 500 /* ms */ #define TRANSACTION_TIMEOUT 5000 /* ms */ #define MAX_INPUT_IDLE_WAIT INFINITE /* ms */ @@ -206,7 +207,7 @@ CloseHandle (pi.hProcess); /* Try to connect */ - for (n = 0; n < 5; n++) + for (n = 0; n < CONNECT_RETRIES; n++) { Sleep (CONNECT_DELAY);
--- a/lisp/ChangeLog Tue May 13 20:26:47 2008 +0200 +++ b/lisp/ChangeLog Wed May 21 21:47:42 2008 +0200 @@ -1,3 +1,32 @@ +2008-05-14 Stephen J. Turnbull <stephen@xemacs.org> + + * subr.el (add-to-list): Fix Aidan's last commit. + +2008-05-14 Aidan Kehoe <kehoea@parhasard.net> + + * subr.el (add-to-list): Implement the same logic with a more + concise syntax; thank you Stephen, in + http://mid.gmane.org/87ablomdwx.fsf@uwakimon.sk.tsukuba.ac.jp . + +2008-02-25 bpalmer <bpalmer@gmail.com> + + * subr.el(add-to-list): add support for `compare-fn' to sync with + emacs. + +2008-05-14 Aidan Kehoe <kehoea@parhasard.net> + + * mule/mule-coding.el (make-8-bit-choose-category):=20 + Control-1 characters extend from #x80 to #x9F (inclusive), + not from #x80 to #xBF. + +2008-05-13 Aidan Kehoe <kehoea@parhasard.net> + + * printer.el (generic-print-region): + (generic-print-buffer): + Use #'valid-device-type-p instead of #'valid-specifier-tag-p to + check if the msprinter device is available, now that msprinter is + always available as a specifier tag. + 2008-05-11 Aidan Kehoe <kehoea@parhasard.net> * disp-table.el (make-display-table):
--- a/lisp/printer.el Tue May 13 20:26:47 2008 +0200 +++ b/lisp/printer.el Wed May 21 21:47:42 2008 +0200 @@ -263,7 +263,7 @@ (let* ((print-region (and (interactive-p) (region-active-p))) (start (if print-region (region-beginning) (point-min buffer))) (end (if print-region (region-end) (point-max buffer)))) - (if (or (not (valid-specifier-tag-p 'msprinter)) + (if (or (not (valid-device-type-p 'msprinter)) (not display-print-dialog)) (generic-print-region start end buffer) (let* ((d (Printer-get-device)) @@ -312,7 +312,7 @@ to-page Last page to print, inclusive, If omitted, printing ends at the end. copies Number of copies to print. If omitted, one copy is printed." - (cond ((valid-specifier-tag-p 'msprinter) + (cond ((valid-device-type-p 'msprinter) ;; loop, printing one copy of document per loop. kill and ;; re-create the frame each time so that we eject the piece ;; of paper at the end even if we're printing more than one
--- a/lisp/subr.el Tue May 13 20:26:47 2008 +0200 +++ b/lisp/subr.el Wed May 21 21:47:42 2008 +0200 @@ -390,19 +390,19 @@ argument to `add-one-shot-hook'." (add-one-shot-hook hook function append t)) -(defun add-to-list (list-var element &optional append) +(defun add-to-list (list-var element &optional append compare-fn) "Add to the value of LIST-VAR the element ELEMENT if it isn't there yet. -The test for presence of ELEMENT is done with `equal'. -If ELEMENT is added, it is added at the beginning of the list, -unless the optional argument APPEND is non-nil, in which case -ELEMENT is added at the end. +The test for presence of ELEMENT is done with COMPARE-FN; if +COMPARE-FN is nil, then it defaults to `equal'. If ELEMENT is added, +it is added at the beginning of the list, unless the optional argument +APPEND is non-nil, in which case ELEMENT is added at the end. If you want to use `add-to-list' on a variable that is not defined until a certain package is loaded, you should put the call to `add-to-list' into a hook function that will be run only after loading the package. `eval-after-load' provides one way to do this. In some cases other hooks, such as major mode hooks, can do the job." - (if (member element (symbol-value list-var)) + (if (member* element (symbol-value list-var) :test (or compare-fn #'equal)) (symbol-value list-var) (set list-var (if append
--- a/man/ChangeLog Tue May 13 20:26:47 2008 +0200 +++ b/man/ChangeLog Wed May 21 21:47:42 2008 +0200 @@ -1,3 +1,9 @@ +2008-05-21 Aidan Kehoe <kehoea@parhasard.net> + + * internals/internals.texi (Ben's README): + Add a couple of @itemize / @end itemize pairs, to prevent + #'batch-texinfo-format choking on the input. + 2008-01-20 Aidan Kehoe <kehoea@parhasard.net> * xemacs/cmdargs.texi (Command Switches):
--- a/man/internals/internals.texi Tue May 13 20:26:47 2008 +0200 +++ b/man/internals/internals.texi Wed May 21 21:47:42 2008 +0200 @@ -16767,6 +16767,7 @@ systems: @enumerate + @itemize @item they would be character->character and operate next to the internal data; this means that coding systems need to be able @@ -16803,6 +16804,7 @@ important: we need a way of specifying how detecting works when we have more than one coding system. we might need more than a single priority list. need to think about this. + @end itemize @end enumerate @item @@ -16821,6 +16823,7 @@ text when it's written out. We need two levels @enumerate + @itemize @item first, a "safe-charset" level that checks before any actual encoding to see if all characters in the document can safely @@ -16852,6 +16855,7 @@ @item same thing (error checking, list of alternatives, etc.) needs to happen when reading! all of this will be a lot of work! + @end itemize @end enumerate @end itemize @end itemize
--- a/src/ChangeLog Tue May 13 20:26:47 2008 +0200 +++ b/src/ChangeLog Wed May 21 21:47:42 2008 +0200 @@ -1,3 +1,9 @@ +2008-05-21 Aidan Kehoe <kehoea@parhasard.net> + + * fileio.c (Fmake_symbolic_link): + Document behaviour when the underlying OS doesn't support symbolic + links. + 2008-05-13 Aidan Kehoe <kehoea@parhasard.net> * emacs.c (SHEBANG_EXE_PROGNAME_LENGTH):
--- a/src/fileio.c Tue May 13 20:26:47 2008 +0200 +++ b/src/fileio.c Wed May 21 21:47:42 2008 +0200 @@ -2199,6 +2199,10 @@ unless optional third argument OK-IF-ALREADY-EXISTS is non-nil. A number as third arg means request confirmation if LINKNAME already exists. This happens for interactive use with M-x. + +On platforms where symbolic links are not available, any file handlers will +be run, but the check for the existence of LINKNAME will not be done, and +the symbolic link will not be created. */ (filename, linkname, ok_if_already_exists)) {
--- a/tests/ChangeLog Tue May 13 20:26:47 2008 +0200 +++ b/tests/ChangeLog Wed May 21 21:47:42 2008 +0200 @@ -1,3 +1,11 @@ +2008-05-21 Aidan Kehoe <kehoea@parhasard.net> + + * automated/mule-tests.el (featurep): + Make sure that working symlinks are available before testing + their functionality. + Also, don't bomb out on deleting the other temporary files if + deleting the first threw an error. + 2008-02-14 Aidan Kehoe <kehoea@parhasard.net> * automated/case-tests.el (let):
--- a/tests/automated/mule-tests.el Tue May 13 20:26:47 2008 +0200 +++ b/tests/automated/mule-tests.el Wed May 21 21:47:42 2008 +0200 @@ -372,19 +372,32 @@ ;; used scaron as the Latin-2 character, and make-temp-name errored ;; on OS X. LATIN CAPITAL LETTER D WITH STROKE does not decompose. (name1 (make-temp-name prefix)) - (name2 (make-temp-name prefix))) - ;; This is how you suppress output from `message', called by `write-region' + (name2 (make-temp-name prefix)) + (name3 (make-temp-name prefix)) + working-symlinks) (Assert (not (equal name1 name2))) (Assert (not (file-exists-p name1))) + ;; This is how you suppress output from `message', called by `write-region' (Silence-Message (write-region (point-min) (point-max) name1)) (Assert (file-exists-p name1)) - (when (fboundp 'make-symbolic-link) + (Silence-Message + (write-region (point-min) (point-max) name3)) + (Assert (file-exists-p name3)) + (condition-case nil + (make-symbolic-link name1 name3) + (file-already-exists + ;; If we actually have functioning symlinks, we end up here, since + ;; name3 already exists and OK-IF-ALREADY-EXISTS was not specified. + (setq working-symlinks t))) + (when working-symlinks (make-symbolic-link name1 name2) (Assert (file-exists-p name2)) (Assert (equal (file-truename name2) name1)) (Assert (equal (file-truename name1) name1))) - (ignore-file-errors (delete-file name1) (delete-file name2))) + (ignore-file-errors (delete-file name1)) + (ignore-file-errors (delete-file name2)) + (ignore-file-errors (delete-file name3))) ;; Add many more file operation tests here...