From: Miles Bader Date: Sun, 11 Nov 2007 00:56:44 +0000 (+0000) Subject: Merge from emacs--devo--0 X-Git-Tag: emacs-pretest-23.0.90~8295^2~278 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/f23d76bdefbd4c06e14d69e99e50d35ce91c8226 Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283 --- f23d76bdefbd4c06e14d69e99e50d35ce91c8226 diff --cc configure index ae2dc48184,3f71a5b2e9..02c6d47003 --- a/configure +++ b/configure @@@ -12079,86 -11980,129 +12010,83 @@@ _ACEO fi fi -### Link with -lXft if available to work around a bug. -HAVE_XFT=maybe -if test "${HAVE_GTK}" = "yes"; then - if test "X${with_pkg_config_prog}" != X; then - PKG_CONFIG="${with_pkg_config_prog}" - fi - - - succeeded=no - - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +HAVE_XAW3D=no +if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then - if test x"${HAVE_X11R5}" != xyes; then - USE_X_TOOLKIT=none - else - if test "$with_xaw3d" != no; then - { echo "$as_me:$LINENO: checking for xaw3d" >&5 ++ if test "$with_xaw3d" != no; then ++ { echo "$as_me:$LINENO: checking for xaw3d" >&5 +echo $ECHO_N "checking for xaw3d... $ECHO_C" >&6; } - if test "${emacs_cv_xaw3d+set}" = set; then ++ if test "${emacs_cv_xaw3d+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - case $PKG_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; +#include +#include +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; esac -fi -PKG_CONFIG=$ac_cv_path_PKG_CONFIG -if test -n "$PKG_CONFIG"; then - { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 -echo "${ECHO_T}$PKG_CONFIG" >&6; } +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + emacs_cv_xaw3d=yes else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + emacs_cv_xaw3d=no +fi - fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi - else - emacs_cv_xaw3d=no - fi - if test $emacs_cv_xaw3d = yes; then - { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 - if test "$PKG_CONFIG" = "no" ; then - HAVE_XFT=no + else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { echo "$as_me:$LINENO: checking for xft >= 0.13.0" >&5 -echo $ECHO_N "checking for xft >= 0.13.0... $ECHO_C" >&6; } - - if $PKG_CONFIG --exists "xft >= 0.13.0" 2>&5; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - succeeded=yes - - { echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5 -echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; } - XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"|sed -e 's,///*,/,g'` - { echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5 -echo "${ECHO_T}$XFT_CFLAGS" >&6; } - - { echo "$as_me:$LINENO: checking XFT_LIBS" >&5 -echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; } - XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"|sed -e 's,///*,/,g'` - { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5 -echo "${ECHO_T}$XFT_LIBS" >&6; } - else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - XFT_CFLAGS="" - XFT_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - XFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xft >= 0.13.0"` - - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi ++ emacs_cv_xaw3d=no + fi ++ if test $emacs_cv_xaw3d = yes; then ++ { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 +echo "${ECHO_T}yes; using Lucid toolkit" >&6; } - USE_X_TOOLKIT=LUCID - HAVE_XAW3D=yes ++ USE_X_TOOLKIT=LUCID ++ HAVE_XAW3D=yes - if test $succeeded = yes; then - : - else - HAVE_XFT=no - fi +cat >>confdefs.h <<\_ACEOF +#define HAVE_XAW3D 1 +_ACEOF - else - { echo "$as_me:$LINENO: result: no" >&5 - if test "$HAVE_XFT" != no; then - OLD_CFLAGS="$CPPFLAGS" - OLD_CPPFLAGS="$CFLAGS" - OLD_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $XFT_CFLAGS" - CFLAGS="$CFLAGS $XFT_CFLAGS" - LIBS="$XFT_LIBS $LIBS" - if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then - { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5 -echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then ++ else ++ { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: checking for libXaw" >&5 ++ { echo "$as_me:$LINENO: checking for libXaw" >&5 +echo $ECHO_N "checking for libXaw... $ECHO_C" >&6; } - if test "${emacs_cv_xaw+set}" = set; then ++ if test "${emacs_cv_xaw+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5 -echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext @@@ -12198,39 -12133,17 +12126,38 @@@ els echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + emacs_cv_xaw=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi - if test $emacs_cv_xaw = yes; then - { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 -# Is the header present? -{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5 -echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF ++ if test $emacs_cv_xaw = yes; then ++ { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 +echo "${ECHO_T}yes; using Lucid toolkit" >&6; } - USE_X_TOOLKIT=LUCID - elif test x"${USE_X_TOOLKIT}" = xLUCID; then - { { echo "$as_me:$LINENO: error: Lucid toolkit requires X11/Xaw include files" >&5 ++ USE_X_TOOLKIT=LUCID ++ elif test x"${USE_X_TOOLKIT}" = xLUCID; then ++ { { echo "$as_me:$LINENO: error: Lucid toolkit requires X11/Xaw include files" >&5 +echo "$as_me: error: Lucid toolkit requires X11/Xaw include files" >&2;} + { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: result: no; do not use toolkit by default" >&5 ++ else ++ { echo "$as_me:$LINENO: result: no; do not use toolkit by default" >&5 +echo "${ECHO_T}no; do not use toolkit by default" >&6; } - USE_X_TOOLKIT=none - fi ++ USE_X_TOOLKIT=none + fi + fi +fi + +X_TOOLKIT_TYPE=$USE_X_TOOLKIT + +if test "${USE_X_TOOLKIT}" != "none"; then + { echo "$as_me:$LINENO: checking X11 toolkit version" >&5 +echo $ECHO_N "checking X11 toolkit version... $ECHO_C" >&6; } + if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext diff --cc lib-src/makefile.w32-in index 190a293984,9a611b8e3f..8e01c9dfea --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@@ -142,15 -142,14 +142,15 @@@ $(BLD)/ctags.$(O): ctags. # make-docfile blindly replaces .o with .c anyway. Keep .o in this list # as it is required by code in doc.c. # - obj = sunfns.o dosfns.o msdos.o \ -obj= dosfns.o msdos.o \ - xterm.o xfns.o xmenu.o xselect.o xrdb.o fringe.o image.o \ - mac.o macterm.o macfns.o macmenu.o fontset.o \ ++obj = dosfns.o msdos.o \ + xterm.o xfns.o xmenu.o xselect.o xrdb.o xsmfns.o fringe.o image.o \ + mac.o macterm.o macfns.o macmenu.o macselect.o fontset.o \ w32.o w32bdf.o w32console.o w32fns.o w32heap.o w32inevt.o \ w32menu.o w32proc.o w32reg.o w32select.o w32term.o w32xfns.o \ + font.o w32font.o \ dispnew.o frame.o scroll.o xdisp.o window.o \ - charset.o coding.o category.o ccl.o \ - cm.o term.o xfaces.o \ + charset.o coding.o category.o ccl.o character.o chartab.o \ + cm.o term.o terminal.o xfaces.o \ emacs.o keyboard.o macros.o keymap.o sysdep.o \ buffer.o filelock.o insdel.o marker.o \ minibuf.o fileio.o dired.o filemode.o \ diff --cc lisp/descr-text.el index c1bdfeb55a,3452874f34..18c4144c5f --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@@ -611,28 -683,9 +611,27 @@@ as well as widgets, buttons, overlays, (insert "\nSee the variable `reference-point-alist' for " "the meaning of the rule.\n")) + (if (not describe-char-unidata-list) + (insert "\nCharacter code properties are not shown: ") + (insert "\nCharacter code properties: ")) + (insert-text-button + "customize what to show" + 'action (lambda (&rest ignore) + (customize-variable + 'describe-char-unidata-list))) + (insert "\n") + (dolist (elt describe-char-unidata-list) + (let ((val (get-char-code-property char elt)) + description) + (when val + (setq description (char-code-property-description elt val)) + (if description + (insert (format " %s: %s (%s)\n" elt val description)) + (insert (format " %s: %s\n" elt val)))))) + (if text-props-desc (insert text-props-desc)) (setq help-xref-stack-item (list 'help-insert-string (buffer-string))) - (toggle-read-only 1) - (print-help-return-message))))) + (toggle-read-only 1))))) (defalias 'describe-char-after 'describe-char) (make-obsolete 'describe-char-after 'describe-char "22.1") diff --cc lisp/ldefs-boot.el index c7679a7e58,8704a6d8cc..9a1092b724 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@@ -2508,13 -2490,14 +2502,13 @@@ with possible additional arguments `bro \(fn URL &optional NEW-WINDOW)" t nil) -(autoload 'browse-url-text-emacs "browse-url" "\ -Ask a text browser to load URL. -URL defaults to the URL around or before point. -This runs the text browser specified by `browse-url-text-browser'. -With a prefix argument, it runs a new browser process in a new buffer. +(autoload 'browse-url-lynx-emacs "browse-url" "\ +Ask the Lynx WWW browser to load URL. +Default to the URL around or before point. With a prefix argument, run +a new Lynx process in a new buffer. When called interactively, if variable `browse-url-new-window-flag' is - non-nil, load the document in a new lynx in a new term window, + non-nil, load the document in a new browser process in a new term window, otherwise use any existing one. A non-nil interactive prefix argument reverses the effect of `browse-url-new-window-flag'. @@@ -7579,17 -7807,9 +7571,17 @@@ Switch to *doctor* buffer and start giv ;;;*** -;;;### (autoloads (double-mode) "double" "double.el" (18203 37786)) +;;;### (autoloads (double-mode double-mode) "double" "double.el" +;;;;;; (18190 35187)) ;;; Generated autoloads from double.el - (defvar double-mode nil "\ ++(autoload 'double-mode "double" "\ +Toggle Double mode. +Setting this variable directly does not take effect; +use either \\[customize] or the function `double-mode'.") + +(custom-autoload 'double-mode "double" nil) + (autoload 'double-mode "double" "\ Toggle Double mode. With prefix argument ARG, turn Double mode on if ARG is positive, otherwise @@@ -12147,10 -12417,10 +12197,10 @@@ instead. This variable is set by `gnus \(fn &optional CATCH-ALL)" t nil) (autoload 'gnus-group-split "gnus-mlspl" "\ -Use information from group parameters in order to split mail. +Uses information from group parameters in order to split mail. See `gnus-group-split-fancy' for more information. - gnus-group-split is a valid value for nnmail-split-methods. + `gnus-group-split' is a valid value for `nnmail-split-methods'. \(fn)" nil nil) @@@ -19662,11 -19848,30 +19798,11 @@@ See also the variable `org-reverse-note \(fn)" nil nil) -(autoload 'org-agenda-to-appt "org" "\ -Activate appointments found in `org-agenda-files'. -When prefixed, prompt for a regular expression and use it as a -filter: only add entries if they match this regular expression. - -FILTER can be a string. In this case, use this string as a -regular expression to filter results. - -FILTER can also be an alist, with the car of each cell being -either 'headline or 'category. For example: - - '((headline \"IMPORTANT\") - (category \"Work\")) - -will only add headlines containing IMPORTANT or headlines -belonging to the category \"Work\". - -\(fn &optional FILTER)" t nil) - (autoload 'org-agenda "org" "\ Dispatch agenda commands to collect entries to the agenda buffer. - Prompts for a character to select a command. Any prefix arg will be passed + Prompts for a command to execute. Any prefix arg will be passed on to the selected command. The default selections are: - g + a Call `org-agenda-list' to display the agenda for current day or week. t Call `org-todo-list' to display the global todo list. T Call `org-todo-list' to display the global todo list, select only @@@ -19752,17 -19959,21 +19890,16 @@@ If the current buffer does not, find th \(fn)" t nil) (autoload 'org-agenda-list "org" "\ -Produce a daily/weekly view from all files in variable `org-agenda-files'. -The view will be for the current day or week, but from the overview buffer -you will be able to go to other days/weeks. - -With one \\[universal-argument] prefix argument INCLUDE-ALL, -all unfinished TODO items will also be shown, before the agenda. -This feature is considered obsolete, please use the TODO list or a block -agenda instead. - -With a numeric prefix argument in an interactive call, the agenda will -span INCLUDE-ALL days. Lisp programs should instead specify NDAYS to change -the number of days. NDAYS defaults to `org-agenda-ndays'. - +Produce a weekly view from all files in variable `org-agenda-files'. +The view will be for the current week, but from the overview buffer you +will be able to go to other weeks. +With one \\[universal-argument] prefix argument INCLUDE-ALL, all unfinished TODO items will +also be shown, under the current date. +With two \\[universal-argument] prefix argument INCLUDE-ALL, all TODO entries marked DONE +on the days are also shown. See the variable `org-log-done' for how +to turn on logging. START-DAY defaults to TODAY, or to the most recent match for the weekday given in `org-agenda-start-on-weekday'. - NDAYS defaults to `org-agenda-ndays'. \(fn &optional INCLUDE-ALL START-DAY NDAYS)" t nil) @@@ -25057,9 -25197,13 +25194,9 @@@ From a program takes two point or marke ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ -Install the spam.el hooks and do other initialization. -When SYMBOLS is given, set those variables to t. This is so you -can call spam-initialize before you set spam-use-* variables on -explicitly, and matters only if you need the extra headers -installed through spam-necessary-extra-headers. +Install the spam.el hooks and do other initialization - \(fn)" t nil) + \(fn &rest SYMBOLS)" t nil) ;;;*** @@@ -28026,11 -28186,11 +28163,11 @@@ See `tramp-file-name-structure' for mor (defconst tramp-file-name-regexp (cond ((equal tramp-syntax 'ftp) tramp-file-name-regexp-unified) ((equal tramp-syntax 'sep) tramp-file-name-regexp-separate) ((equal tramp-syntax 'url) tramp-file-name-regexp-url) (t (error "Wrong `tramp-syntax' defined"))) "\ *Regular expression matching file names handled by Tramp. -This regexp should match Tramp file names but no other file names. +This regexp should match tramp file names but no other file names. \(When tramp.el is loaded, this regular expression is prepended to `file-name-handler-alist', and that is searched sequentially. Thus, - if the tramp entry appears rather early in the `file-name-handler-alist' - and is a bit too general, then some files might be considered tramp + if the Tramp entry appears rather early in the `file-name-handler-alist' + and is a bit too general, then some files might be considered Tramp files which are not really Tramp files. Please note that the entry in `file-name-handler-alist' is made when @@@ -28995,11 -29144,16 +29132,14 @@@ Not documente \(fn X Y)" nil nil) -(autoload 'url-file-directory "url-util" "\ -Return the directory part of FILE, for a URL. +(autoload 'url-basepath "url-util" "\ +Return the base pathname of FILE, or the actual filename if X is true. - \(fn FILE &optional X)" nil nil) + \(fn FILE)" nil nil) + + (autoload 'url-file-nondirectory "url-util" "\ + Return the nondirectory part of FILE, for a URL. -\(fn FILE)" nil nil) - (autoload 'url-parse-query-string "url-util" "\ Not documented @@@ -29117,13 -29261,13 +29257,13 @@@ If FILE-NAME is non-nil, save the resul ;;;*** - ;;;### (autoloads (vc-annotate vc-update-change-log vc-rename-file - ;;;;;; vc-transfer-file vc-switch-backend vc-rollback vc-update - ;;;;;; vc-revert vc-print-log vc-retrieve-snapshot vc-create-snapshot + ;;;### (autoloads (vc-annotate vc-branch-part vc-trunk-p vc-update-change-log + ;;;;;; vc-rename-file vc-transfer-file vc-switch-backend vc-update + ;;;;;; vc-rollback vc-revert vc-print-log vc-retrieve-snapshot vc-create-snapshot ;;;;;; vc-directory vc-merge vc-insert-headers vc-revision-other-window -;;;;;; vc-diff vc-version-diff vc-register vc-next-action vc-do-command -;;;;;; edit-vc-file with-vc-file vc-before-checkin-hook vc-checkin-hook -;;;;;; vc-checkout-hook) "vc" "vc.el" (18214 4763)) +;;;;;; vc-diff vc-register vc-next-action vc-do-command edit-vc-file +;;;;;; with-vc-file vc-before-checkin-hook vc-checkin-hook vc-checkout-hook) +;;;;;; "vc" "vc.el" (18190 35214)) ;;; Generated autoloads from vc.el (defvar vc-checkout-hook nil "\ @@@ -29178,28 -29322,18 +29318,26 @@@ that is inserted into the command line \(fn BUFFER OKSTATUS COMMAND FILE-OR-LIST &rest FLAGS)" nil nil) (autoload 'vc-next-action "vc" "\ -Do the next logical version control operation on the current fileset. -This requires that all files in the fileset be in the same state. +Do the next logical version control operation on the current file. + +If you call this from within a VC dired buffer with no files marked, +it will operate on the file in the current line. + +If you call this from within a VC dired buffer, and one or more +files are marked, it will accept a log message and then operate on +each one. The log message will be used as a comment for any register +or checkin operations, but ignored when doing checkouts. Attempted +lock steals will raise an error. - A prefix argument lets you specify the version number to use. - - For RCS and SCCS files: - If the file is not already registered, this registers it for version + For locking systems: + If every file is not already registered, this registers each for version control. - If the file is registered and not locked by anyone, this checks out - a writable and locked file ready for editing. - If the file is checked out and locked by the calling user, this - first checks to see if the file has changed since checkout. If not, - it performs a revert. - If the file has been changed, this pops up a buffer for entry + If every file is registered and not locked by anyone, this checks out + a writable and locked file of each ready for editing. + If every file is checked out and locked by the calling user, this + first checks to see if each file has changed since checkout. If not, + it performs a revert on that file. + If every file has been changed, this pops up a buffer for entry of a log message; when the message has been entered, it checks in the resulting changes along with the log message as change commentary. If the variable `vc-keep-workfiles' is non-nil (which is its default), a @@@ -29232,15 -29366,24 +29370,20 @@@ directory are already registered under register the file. If no backend declares itself responsible, the first backend that could register the file is used. - \(fn &optional SET-VERSION COMMENT)" t nil) + \(fn &optional SET-REVISION COMMENT)" t nil) + + (autoload 'vc-version-diff "vc" "\ + Report diffs between revisions of the fileset in the repository history. + + \(fn FILES REV1 REV2)" t nil) (autoload 'vc-diff "vc" "\ -Display diffs between file revisions. -Normally this compares the currently selected fileset with their -working revisions. With a prefix argument HISTORIC, it reads two revision -designators specifying which revisions to compare. - -If no current fileset is available (that is, we are not in -VC-Dired mode and the visited file of the current buffer is not -under version control) and we're in a Dired buffer, use -the current directory. -The optional argument NOT-URGENT non-nil means it is ok to say no to +Display diffs between file versions. +Normally this compares the current file and buffer with the most +recent checked in version of that file. This uses no arguments. With +a prefix argument HISTORIC, it reads the file name to use and two +version designators specifying which versions to compare. The +optional argument NOT-URGENT non-nil means it is ok to say no to saving the buffer. \(fn HISTORIC &optional NOT-URGENT)" t nil) @@@ -29301,16 -29444,15 +29444,15 @@@ allowed and simply skipped) \(fn DIR NAME)" t nil) (autoload 'vc-print-log "vc" "\ -List the change log of the current fileset in a window. -If WORKING-REVISION is non-nil, leave the point at that revision. +List the change log of the current buffer in a window. +If FOCUS-REV is non-nil, leave the point at that revision. - \(fn &optional FOCUS-REV)" t nil) + \(fn &optional WORKING-REVISION)" t nil) (autoload 'vc-revert "vc" "\ -Revert working copies of the selected fileset to their repository contents. +Revert the current buffer's file to the version it was based on. This asks for confirmation if the buffer contents are not identical - to that version. This function does not automatically pick up newer - changes found in the master file; use \\[universal-argument] \\[vc-next-action] to do so. + to the working revision (except for keyword expansion). \(fn)" t nil) diff --cc lisp/ps-print.el index 7c40857379,ce92e4781e..f66416de66 --- a/lisp/ps-print.el +++ b/lisp/ps-print.el @@@ -1477,9 -1492,30 +1477,13 @@@ Please send all bug fixes and enhanceme (memq system-type '(usg-unix-v dgux hpux irix))) -(defun ps-xemacs-color-name (color) - (when (featurep 'xemacs) - (if (color-specifier-p color) - (color-name color) - color))) - -(defalias 'ps-frame-parameter - (if (fboundp 'frame-parameter) 'frame-parameter 'frame-property)) - -(defalias 'ps-mark-active-p - (if (fboundp 'region-active-p) - 'region-active-p ; XEmacs - (defvar mark-active) ; To shup up XEmacs's byte compiler. - (lambda () mark-active))) ; Emacs - -(defun ps-face-foreground-name (face) - (if (featurep 'xemacs) - (ps-xemacs-color-name (face-foreground face)) - (face-foreground face nil t))) +;; Load XEmacs/Emacs definitions +(eval-and-compile (require 'ps-def)) + (defun ps-face-background-name (face) + (if (featurep 'xemacs) + (ps-xemacs-color-name (face-background face)) + (face-background face nil t))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; User Variables: diff --cc lisp/w32-fns.el index 26bebe040e,d925747544..994eb76723 --- a/lisp/w32-fns.el +++ b/lisp/w32-fns.el @@@ -379,14 -379,12 +379,14 @@@ bit output with no translation. ;; value from w32-select-font etc, so list the most important charsets last. (w32-add-charset-info "iso8859-14" 'w32-charset-ansi 28604) (w32-add-charset-info "iso8859-15" 'w32-charset-ansi 28605) +;; The following two are included for pattern matching. +(w32-add-charset-info "jisx0201" 'w32-charset-shiftjis 932) +(w32-add-charset-info "jisx0208" 'w32-charset-shiftjis 932) (w32-add-charset-info "jisx0201-latin" 'w32-charset-shiftjis 932) (w32-add-charset-info "jisx0201-katakana" 'w32-charset-shiftjis 932) - (w32-add-charset-info "ksc5601.1987" 'w32-charset-hangeul 949) - (w32-add-charset-info "big5" 'w32-charset-chinesebig5 950) - (w32-add-charset-info "gb2312" 'w32-charset-gb2312 936) -(w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932) + (w32-add-charset-info "ksc5601.1989-1" 'w32-charset-hangeul 949) + (w32-add-charset-info "big5-1" 'w32-charset-chinesebig5 950) + (w32-add-charset-info "gb2312.1980-1" 'w32-charset-gb2312 936) (w32-add-charset-info "ms-symbol" 'w32-charset-symbol nil) (w32-add-charset-info "ms-oem" 'w32-charset-oem 437) (w32-add-charset-info "ms-oemlatin" 'w32-charset-oem 850) @@@ -402,23 -400,14 +402,22 @@@ (w32-add-charset-info "iso8859-13" 'w32-charset-baltic 1257) (w32-add-charset-info "koi8-r" 'w32-charset-russian 20866) (w32-add-charset-info "iso8859-5" 'w32-charset-russian 28595) - (w32-add-charset-info "tis620" 'w32-charset-thai 874) - (w32-add-charset-info "ksc5601.1992" 'w32-charset-johab 1361) + (w32-add-charset-info "tis620-1" 'w32-charset-thai 874) + (w32-add-charset-info "ksc5601.1992-1" 'w32-charset-johab 1361) - (w32-add-charset-info "mac-latin" 'w32-charset-mac nil))) + (w32-add-charset-info "mac-roman" 'w32-charset-mac 10000))) (if (boundp 'w32-unicode-charset-defined) (progn - (w32-add-charset-info "unicode" 'w32-charset-unicode t) (w32-add-charset-info "iso10646-1" 'w32-charset-unicode t)) - ;; If unicode windows charset is not defined, use ansi fonts. - (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) + (w32-add-charset-info "iso10646-1" 'w32-charset-default t)) +;; ;; If unicode windows charset is not defined, use ansi fonts. +;; (w32-add-charset-info "iso10646-1" 'w32-charset-ansi t)) + +;; Prefered names +(w32-add-charset-info "big5-0" 'w32-charset-chinesebig5 950) +(w32-add-charset-info "gb2312.1980-0" 'w32-charset-gb2312 936) +(w32-add-charset-info "jisx0208-sjis" 'w32-charset-shiftjis 932) +(w32-add-charset-info "ksc5601.1987-0" 'w32-charset-hangeul 949) +(w32-add-charset-info "tis620-0" 'w32-charset-thai 874) (w32-add-charset-info "iso8859-1" 'w32-charset-ansi 1252) (make-obsolete-variable 'w32-enable-italics diff --cc make-dist index a2b00018d6,0703c51ab8..8a67e7a459 --- a/make-dist +++ b/make-dist @@@ -318,11 -318,12 +318,12 @@@ for subdir in lisp site-lisp leim/SKK-DIC leim/ja-dic leim/quail \ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ - etc etc/charsets etc/e \ - etc etc/e etc/gnus \ ++ etc etc/charsets etc/e etc/gnus \ etc/images etc/images/ezimage etc/images/gnus etc/images/gud \ etc/images/icons etc/images/low-color etc/images/mail \ - etc/images/smilies etc/images/tree-widget \ - etc/images/tree-widget/default etc/images/tree-widget/folder \ + etc/images/smilies etc/images/smilies/grayscale \ + etc/images/smilies/medium etc/images/tree-widget \ + etc/images/tree-widget/default etc/images/tree-widget/folder \ etc/refcards etc/tutorials info doc doc/emacs doc/misc doc/man \ doc/lispref doc/lispintro m4 msdos vms mac mac/inc \ mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \ @@@ -597,7 -598,7 +598,7 @@@ echo "Making links to \`etc' rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core rm -f TAGS) - for dir in etc/charsets etc/e etc/tutorials etc/refcards ; do -for dir in etc/e etc/gnus etc/tutorials etc/refcards ; do ++for dir in etc/charsets etc/e etc/gnus etc/tutorials etc/refcards ; do echo "Making links to \`${dir}'" (cd ${dir} ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/${dir} diff --cc src/w32term.c index aae8447353,4f4701b5f2..93e81b7bdb --- a/src/w32term.c +++ b/src/w32term.c @@@ -4423,10 -3967,10 +4422,10 @@@ w32_scroll_bar_handle_click (bar, msg, W32Msg *msg; struct input_event *emacs_event; { - if (! GC_WINDOWP (bar->window)) + if (! WINDOWP (bar->window)) abort (); - emacs_event->kind = W32_SCROLL_BAR_CLICK_EVENT; + emacs_event->kind = SCROLL_BAR_CLICK_EVENT; emacs_event->code = 0; /* not really meaningful to distinguish up/down */ emacs_event->modifiers = msg->dwModifiers; diff --cc src/xfaces.c index 50d733c7d0,36bbacb84c..fd7dbb8813 --- a/src/xfaces.c +++ b/src/xfaces.c @@@ -8213,9 -7729,88 +8213,88 @@@ face_at_buffer_position (w, pos, region /* Look up a realized face with the given face attributes, or realize a new one for ASCII characters. */ - return lookup_face (f, attrs, 0, NULL); + return lookup_face (f, attrs); } + /* Return the face ID at buffer position POS for displaying ASCII + characters associated with overlay strings for overlay OVERLAY. + + Like face_at_buffer_position except for OVERLAY. Currently it + simply disregards the `face' properties of all overlays. */ + + int + face_for_overlay_string (w, pos, region_beg, region_end, + endptr, limit, mouse, overlay) + struct window *w; + int pos; + int region_beg, region_end; + int *endptr; + int limit; + int mouse; + Lisp_Object overlay; + { + struct frame *f = XFRAME (w->frame); + Lisp_Object attrs[LFACE_VECTOR_SIZE]; + Lisp_Object prop, position; + int i, noverlays; + Lisp_Object *overlay_vec; + Lisp_Object frame; + int endpos; + Lisp_Object propname = mouse ? Qmouse_face : Qface; + Lisp_Object limit1, end; + struct face *default_face; + + /* W must display the current buffer. We could write this function + to use the frame and buffer of W, but right now it doesn't. */ + /* xassert (XBUFFER (w->buffer) == current_buffer); */ + + XSETFRAME (frame, f); + XSETFASTINT (position, pos); + + endpos = ZV; + if (pos < region_beg && region_beg < endpos) + endpos = region_beg; + + /* Get the `face' or `mouse_face' text property at POS, and + determine the next position at which the property changes. */ + prop = Fget_text_property (position, propname, w->buffer); + XSETFASTINT (limit1, (limit < endpos ? limit : endpos)); + end = Fnext_single_property_change (position, propname, w->buffer, limit1); + if (INTEGERP (end)) + endpos = XINT (end); + + *endptr = endpos; + + default_face = FACE_FROM_ID (f, DEFAULT_FACE_ID); + + /* Optimize common cases where we can use the default face. */ + if (NILP (prop) + && !(pos >= region_beg && pos < region_end)) + return DEFAULT_FACE_ID; + + /* Begin with attributes from the default face. */ + bcopy (default_face->lface, attrs, sizeof attrs); + + /* Merge in attributes specified via text properties. */ + if (!NILP (prop)) + merge_face_ref (f, prop, attrs, 1, 0); + + /* If in the region, merge in the region face. */ + if (pos >= region_beg && pos < region_end) + { + merge_named_face (f, Qregion, attrs, 0); + + if (region_end < endpos) + endpos = region_end; + } + + *endptr = endpos; + + /* Look up a realized face with the given face attributes, + or realize a new one for ASCII characters. */ + return lookup_face (f, attrs, 0, NULL); + } + /* Compute the face at character position POS in Lisp string STRING on window W, for ASCII characters.