Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102470. ------------------------------------------------------------ revno: 102470 author: YAMAMOTO Mitsuharu committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-11-21 19:43:53 -0500 message: * alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-21 15:46:23 +0000 +++ src/ChangeLog 2010-11-22 00:43:53 +0000 @@ -1,3 +1,8 @@ +2010-11-22 YAMAMOTO Mitsuharu + + * alloc.c (mark_maybe_object): Return early if given a Lisp + integer (Bug#6301). + 2010-11-21 Ken Brown * sheap.c (STATIC_HEAP_SIZE): Revert previous change. === modified file 'src/alloc.c' --- src/alloc.c 2010-11-18 21:45:03 +0000 +++ src/alloc.c 2010-11-22 00:43:53 +0000 @@ -3986,8 +3986,14 @@ static INLINE void mark_maybe_object (Lisp_Object obj) { - void *po = (void *) XPNTR (obj); - struct mem_node *m = mem_find (po); + void *po; + struct mem_node *m; + + if (INTEGERP (obj)) + return; + + po = (void *) XPNTR (obj); + m = mem_find (po); if (m != MEM_NIL) { ------------------------------------------------------------ revno: 102469 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2010-11-21 22:46:16 +0000 message: Merge changes made in Gnus trunk. nnir.el: Fix typo in comments. (nnir-run-imap): Simplify code. No need to reverse artlist. (nnir-run-gmane): Use nnir-tmp-buffer for web results. gnus-srvr.el (gnus-server-show-server): New command and keystroke. nnimap.el (nnimap-get-capabilities): Refactor out. (nnimap-open-connection): Re-request capabilities after STARTTLS. gnus.texi (Server Commands): Document gnus-server-show-server. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-11-20 13:17:25 +0000 +++ doc/misc/ChangeLog 2010-11-21 22:46:16 +0000 @@ -1,3 +1,7 @@ +2010-11-21 Lars Magne Ingebrigtsen + + * gnus.texi (Server Commands): Document gnus-server-show-server. + 2010-11-20 Michael Albinus Sync with Tramp 2.2.0. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-11-18 02:38:03 +0000 +++ doc/misc/gnus.texi 2010-11-21 22:46:16 +0000 @@ -13840,6 +13840,11 @@ @findex gnus-server-edit-server Edit a server (@code{gnus-server-edit-server}). +@item S +@kindex S (Server) +@findex gnus-server-show-server +Show the definition of a server (@code{gnus-server-show-server}). + @item SPACE @kindex SPACE (Server) @findex gnus-server-read-server === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-21 08:51:04 +0000 +++ lisp/gnus/ChangeLog 2010-11-21 22:46:16 +0000 @@ -1,3 +1,16 @@ +2010-11-21 Andrew Cohen + + * nnir.el: Fix typo in comments. + (nnir-run-imap): Simplify code. No need to reverse artlist. + (nnir-run-gmane): Use nnir-tmp-buffer for web results. + +2010-11-21 Lars Magne Ingebrigtsen + + * gnus-srvr.el (gnus-server-show-server): New command and keystroke. + + * nnimap.el (nnimap-get-capabilities): Refactor out. + (nnimap-open-connection): Re-request capabilities after STARTTLS. + 2010-11-21 Ralf Angeli * mm-uu.el (mm-uu-type-alist): Prevent spurious empty line from === modified file 'lisp/gnus/gnus-srvr.el' --- lisp/gnus/gnus-srvr.el 2010-10-31 22:31:24 +0000 +++ lisp/gnus/gnus-srvr.el 2010-11-21 22:46:16 +0000 @@ -115,6 +115,7 @@ ["Kill" gnus-server-kill-server t] ["Yank" gnus-server-yank-server t] ["Copy" gnus-server-copy-server t] + ["Show" gnus-server-show-server t] ["Edit" gnus-server-edit-server t] ["Regenerate" gnus-server-regenerate-server t] ["Compact" gnus-server-compact-server t] @@ -152,6 +153,7 @@ "c" gnus-server-copy-server "a" gnus-server-add-server "e" gnus-server-edit-server + "S" gnus-server-show-server "s" gnus-server-scan-server "O" gnus-server-open-server @@ -609,6 +611,18 @@ (gnus-server-position-point)) 'edit-server))) +(defun gnus-server-show-server (server) + "Show the definition of the server on the current line." + (interactive (list (gnus-server-server-name))) + (unless server + (error "No server on current line")) + (let ((info (gnus-server-to-method server))) + (gnus-edit-form + info "Showing the server." + `(lambda (form) + (gnus-server-position-point)) + 'edit-server))) + (defun gnus-server-scan-server (server) "Request a scan from the current server." (interactive (list (gnus-server-server-name))) === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-11-21 07:11:35 +0000 +++ lisp/gnus/nnimap.el 2010-11-21 22:46:16 +0000 @@ -375,12 +375,7 @@ (setf (nnimap-greeting nnimap-object) (buffer-substring (line-beginning-position) (line-end-position))) - ;; Store the capabilities. - (setf (nnimap-capabilities nnimap-object) - (mapcar - #'upcase - (nnimap-find-parameter - "CAPABILITY" (cdr (nnimap-command "CAPABILITY"))))) + (nnimap-get-capabilities) (when nnimap-server-port (push (format "%s" nnimap-server-port) ports)) ;; If this is a STARTTLS-capable server, then sever the @@ -391,7 +386,10 @@ (eq nnimap-stream 'starttls)) (fboundp 'open-gnutls-stream)) (nnimap-command "STARTTLS") - (gnutls-negotiate (nnimap-process nnimap-object) nil)) + (gnutls-negotiate (nnimap-process nnimap-object) nil) + ;; Get the capabilities again -- they may have changed + ;; after doing STARTTLS. + (nnimap-get-capabilities)) ((and (eq nnimap-stream 'network) (nnimap-capability "STARTTLS")) (let ((nnimap-stream 'starttls)) @@ -447,6 +445,13 @@ (nnimap-command "ENABLE QRESYNC")) (nnimap-process nnimap-object)))))))) +(defun nnimap-get-capabilities () + (setf (nnimap-capabilities nnimap-object) + (mapcar + #'upcase + (nnimap-find-parameter + "CAPABILITY" (cdr (nnimap-command "CAPABILITY")))))) + (defun nnimap-quote-specials (string) (with-temp-buffer (insert string) === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-11-17 22:15:24 +0000 +++ lisp/gnus/nnir.el 2010-11-21 22:46:16 +0000 @@ -41,7 +41,7 @@ ;; Retrieval Status Value (score). ;; When looking at the retrieval result (in the Summary buffer) you -;; can type `A W' (aka M-x gnus-warp-article RET) on an article. You +;; can type `A W' (aka M-x gnus-warp-to-article RET) on an article. You ;; will be warped into the group this article came from. Typing `A W' ;; (aka M-x gnus-summary-refer-thread RET) will warp to the group and ;; also show the thread this article is part of. @@ -682,9 +682,8 @@ (apply 'vconcat (mapcar - (lambda (x) - (let ((group x) - artlist) + (lambda (group) + (let (artlist) (condition-case () (when (nnimap-possibly-change-group (gnus-group-short-name group) server) @@ -706,7 +705,7 @@ (message "Searching %s... %d matches" group arts))) (message "Searching %s...done" group)) (quit nil)) - (reverse artlist))) + artlist)) groups))))) (defun nnir-imap-make-query (criteria qstring) @@ -1316,7 +1315,7 @@ (gnus-inhibit-demon t) artlist) (require 'mm-url) - (with-current-buffer nntp-server-buffer + (with-current-buffer (get-buffer-create nnir-tmp-buffer) (erase-buffer) (mm-url-insert (concat ------------------------------------------------------------ revno: 102468 committer: Michael Albinus branch nick: trunk timestamp: Sun 2010-11-21 20:46:48 +0100 message: The default value of `backup-by-copying-when-mismatch' is now t. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-11-17 02:37:45 +0000 +++ etc/NEWS 2010-11-21 19:46:48 +0000 @@ -230,6 +230,8 @@ ** completion-at-point is now an alias for complete-symbol. +** The default value of `backup-by-copying-when-mismatch' is now t. + ** Deletion changes *** New option `delete-active-region'. ------------------------------------------------------------ revno: 102467 committer: Michael Albinus branch nick: trunk timestamp: Sun 2010-11-21 20:39:21 +0100 message: * files.el (backup-by-copying-when-mismatch): The default value is now t. * startup.el (normal-top-level): * net/tramp.el (tramp-handle-insert-file-contents): Do not set `backup-by-copying-when-mismatch'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-21 18:29:08 +0000 +++ lisp/ChangeLog 2010-11-21 19:39:21 +0000 @@ -1,3 +1,12 @@ +2010-11-21 Michael Albinus + + * files.el (backup-by-copying-when-mismatch): The default value is + now t. + + * startup.el (normal-top-level): + * net/tramp.el (tramp-handle-insert-file-contents): Do not set + `backup-by-copying-when-mismatch'. + 2010-11-21 Jan Djärv * tool-bar.el (tool-bar-setup): Remove save as, print and customize. === modified file 'lisp/files.el' --- lisp/files.el 2010-11-18 03:54:14 +0000 +++ lisp/files.el 2010-11-21 19:39:21 +0000 @@ -115,13 +115,14 @@ :type 'boolean :group 'backup) -(defcustom backup-by-copying-when-mismatch nil +(defcustom backup-by-copying-when-mismatch t "Non-nil means create backups by copying if this preserves owner or group. Renaming may still be used (subject to control of other variables) when it would not result in changing the owner or group of the file; that is, for files which are owned by you and whose group matches the default for a new file created there by you. This variable is relevant only if `backup-by-copying' is nil." + :version "24.1" :type 'boolean :group 'backup) (put 'backup-by-copying-when-mismatch 'permanent-local t) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2010-11-20 13:12:27 +0000 +++ lisp/net/tramp.el 2010-11-21 19:39:21 +0000 @@ -2861,12 +2861,7 @@ (setq buffer-file-name filename) (setq buffer-read-only (not (file-writable-p filename))) (set-visited-file-modtime) - (set-buffer-modified-p nil) - ;; For root, preserve owner and group when editing files. - (when (string-equal - (tramp-file-name-handler 'file-remote-p filename 'user) - "root") - (set (make-local-variable 'backup-by-copying-when-mismatch) t))) + (set-buffer-modified-p nil)) (when (and (stringp local-copy) (or remote-copy (null tramp-temp-buffer-file-name))) (delete-file local-copy)) === modified file 'lisp/startup.el' --- lisp/startup.el 2010-11-14 02:09:11 +0000 +++ lisp/startup.el 2010-11-21 19:39:21 +0000 @@ -466,9 +466,6 @@ ;; `user-full-name' is now known; reset its standard-value here. (put 'user-full-name 'standard-value (list (default-value 'user-full-name))) - ;; For root, preserve owner and group when editing files. - (if (equal (user-uid) 0) - (setq backup-by-copying-when-mismatch t)) ;; Look in each dir in load-path for a subdirs.el file. ;; If we find one, load it, which will add the appropriate subdirs ;; of that dir into load-path, ------------------------------------------------------------ revno: 102466 committer: Jan D. branch nick: trunk timestamp: Sun 2010-11-21 19:29:08 +0100 message: * tool-bar.el (tool-bar-setup): Remove save as, print and customize. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-21 17:12:44 +0000 +++ lisp/ChangeLog 2010-11-21 18:29:08 +0000 @@ -1,3 +1,7 @@ +2010-11-21 Jan Djärv + + * tool-bar.el (tool-bar-setup): Remove save as, print and customize. + 2010-11-21 Deniz Dogan * progmodes/python.el (python-font-lock-keywords): Highlight === modified file 'lisp/tool-bar.el' --- lisp/tool-bar.el 2010-11-20 14:51:25 +0000 +++ lisp/tool-bar.el 2010-11-21 18:29:08 +0000 @@ -271,11 +271,6 @@ (not (eq 'special (get major-mode 'mode-class))))) - (tool-bar-add-item-from-menu 'write-file "saveas" nil :vert-only t - :visible '(or buffer-file-name - (not (eq 'special - (get major-mode - 'mode-class))))) (tool-bar-add-item-from-menu 'undo "undo" nil :vert-only t :visible '(not (eq 'special (get major-mode 'mode-class)))) @@ -297,16 +292,12 @@ ;; than a lambda for Read Mail. ;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose") - (tool-bar-add-item-from-menu 'print-buffer "print" nil :label "Print") ;; tool-bar-add-item-from-menu itself operates on ;; (default-value 'tool-bar-map), but when we don't use that function, ;; we must explicitly operate on the default value. (let ((tool-bar-map (default-value 'tool-bar-map))) - (tool-bar-add-item "preferences" 'customize 'customize - :help "Edit preferences (customize)") - (tool-bar-add-item "help" (lambda () (interactive) (popup-menu menu-bar-help-menu)) ------------------------------------------------------------ revno: 102465 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-11-21 12:12:44 -0500 message: Highlight top-level augmented assignments in Python (Bug#6445). * progmodes/python.el (python-font-lock-keywords): Highlight top-level augmented assignments (Bug#6445). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-21 13:09:34 +0000 +++ lisp/ChangeLog 2010-11-21 17:12:44 +0000 @@ -1,3 +1,8 @@ +2010-11-21 Deniz Dogan + + * progmodes/python.el (python-font-lock-keywords): Highlight + top-level augmented assignments (Bug#6445). + 2010-11-21 Jan Djärv * term/ns-win.el (ns-right-control-modifier) === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2010-11-18 03:54:14 +0000 +++ lisp/progmodes/python.el 2010-11-21 17:12:44 +0000 @@ -110,7 +110,8 @@ (,(rx symbol-start (group "def") (1+ space) (group (1+ (or word ?_)))) (1 font-lock-keyword-face) (2 font-lock-function-name-face)) ;; Top-level assignments are worth highlighting. - (,(rx line-start (group (1+ (or word ?_))) (0+ space) "=") + (,(rx line-start (group (1+ (or word ?_))) (0+ space) + (opt (or "+" "-" "*" "**" "/" "//" "&" "%" "|" "^" "<<" ">>")) "=") (1 font-lock-variable-name-face)) ;; Decorators. (,(rx line-start (* (any " \t")) (group "@" (1+ (or word ?_)) ------------------------------------------------------------ revno: 102464 committer: Ken Brown branch nick: trunk timestamp: Sun 2010-11-21 10:46:23 -0500 message: * src/sheap.c (STATIC_HEAP_SIZE): Revert previous change. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-21 13:09:34 +0000 +++ src/ChangeLog 2010-11-21 15:46:23 +0000 @@ -1,3 +1,7 @@ +2010-11-21 Ken Brown + + * sheap.c (STATIC_HEAP_SIZE): Revert previous change. + 2010-11-21 Jan Djärv * nsterm.m (ns_right_command_modifier, ns_right_control_modifier): === modified file 'src/sheap.c' --- src/sheap.c 2010-11-20 15:23:49 +0000 +++ src/sheap.c 2010-11-21 15:46:23 +0000 @@ -25,7 +25,7 @@ #include -#define STATIC_HEAP_SIZE (13 * 1024 * 1024) +#define STATIC_HEAP_SIZE (12 * 1024 * 1024) int debug_sheap = 0; ------------------------------------------------------------ revno: 102463 committer: Jan D. branch nick: trunk timestamp: Sun 2010-11-21 15:39:55 +0100 message: ns_appbindir must end in /. diff: === modified file 'configure' --- configure 2010-11-18 03:54:14 +0000 +++ configure 2010-11-21 14:39:55 +0000 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for emacs 24.0.50. +# Generated by GNU Autoconf 2.65 for emacs 24.0.50. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -316,7 +316,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -356,19 +356,19 @@ fi # as_fn_arith -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -530,7 +530,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -912,9 +912,8 @@ fi case $ac_option in - *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *=) ac_optarg= ;; - *) ac_optarg=yes ;; + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -959,7 +958,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -985,7 +984,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1189,7 +1188,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1205,7 +1204,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1235,8 +1234,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error $? "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information" + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) @@ -1244,7 +1243,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; + as_fn_error "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1262,13 +1261,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error $? "missing argument to $ac_option" + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1291,7 +1290,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1305,8 +1304,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1321,9 +1320,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error $? "working directory cannot be determined" + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error $? "pwd does not report name of working directory" + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1362,11 +1361,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1406,7 +1405,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking ...' messages + -q, --quiet, --silent do not print \`checking...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1625,9 +1624,9 @@ if $ac_init_version; then cat <<\_ACEOF emacs configure 24.0.50 -generated by GNU Autoconf 2.67 +generated by GNU Autoconf 2.65 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1743,7 +1742,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { + test $ac_status = 0; } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1767,10 +1766,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1806,7 +1805,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1833,7 +1832,7 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1897,7 +1896,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1919,18 +1918,15 @@ } # ac_fn_c_check_header_compile -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- -# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. +# ac_fn_c_check_decl LINENO SYMBOL VAR +# ------------------------------------ +# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - as_decl_name=`echo $2|sed 's/ *(.*//'` - as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 +$as_echo_n "checking whether $2 is declared... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1939,12 +1935,8 @@ int main () { -#ifndef $as_decl_name -#ifdef __cplusplus - (void) $as_decl_use; -#else - (void) $as_decl_name; -#endif +#ifndef $2 + (void) $2; #endif ; @@ -1973,7 +1965,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1985,7 +1977,7 @@ else eval "$3=no" fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 @@ -2003,7 +1995,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 $as_echo_n "checking for $2.$3... " >&6; } -if eval "test \"\${$4+set}\"" = set; then : +if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2059,7 +2051,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2127,7 +2119,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -2176,7 +2168,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by emacs $as_me 24.0.50, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2286,9 +2278,11 @@ { echo - $as_echo "## ---------------- ## + cat <<\_ASBOX +## ---------------- ## ## Cache variables. ## -## ---------------- ##" +## ---------------- ## +_ASBOX echo # The following way of writing the cache mishandles newlines in values, ( @@ -2322,9 +2316,11 @@ ) echo - $as_echo "## ----------------- ## + cat <<\_ASBOX +## ----------------- ## ## Output variables. ## -## ----------------- ##" +## ----------------- ## +_ASBOX echo for ac_var in $ac_subst_vars do @@ -2337,9 +2333,11 @@ echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + cat <<\_ASBOX +## ------------------- ## ## File substitutions. ## -## ------------------- ##" +## ------------------- ## +_ASBOX echo for ac_var in $ac_subst_files do @@ -2353,9 +2351,11 @@ fi if test -s confdefs.h; then - $as_echo "## ----------- ## + cat <<\_ASBOX +## ----------- ## ## confdefs.h. ## -## ----------- ##" +## ----------- ## +_ASBOX echo cat confdefs.h echo @@ -2410,12 +2410,7 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2430,11 +2425,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } + . "$ac_site_file" fi done @@ -2515,7 +2506,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2689,7 +2680,7 @@ g | gt | gtk ) val=gtk ;; gtk3 ) val=gtk3 ;; * ) -as_fn_error $? "\`--with-x-toolkit=$withval' is invalid; +as_fn_error "\`--with-x-toolkit=$withval' is invalid; this option's value should be \`yes', \`no', \`lucid', \`athena', \`motif', \`gtk' or \`gtk3'. \`yes' and \`gtk' are synonyms. \`athena' and \`lucid' are synonyms." "$LINENO" 5 ;; @@ -2992,7 +2983,7 @@ stringfreelist) ac_gc_check_string_free_list=1 ;; xmallocoverrun) ac_xmalloc_overrun=1 ;; conslist) ac_gc_check_cons_list=1 ;; - *) as_fn_error $? "unknown check category $check" "$LINENO" 5 ;; + *) as_fn_error "unknown check category $check" "$LINENO" 5 ;; esac done IFS="$ac_save_IFS" @@ -3107,22 +3098,16 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -3136,7 +3121,7 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -3147,16 +3132,16 @@ test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -3181,7 +3166,7 @@ ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -3189,7 +3174,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3483,7 +3468,7 @@ if test $unported = yes; then - as_fn_error $? "Emacs hasn't been ported to \`${canonical}' systems. + as_fn_error "Emacs hasn't been ported to \`${canonical}' systems. Check \`etc/MACHINES' for recognized configuration names." "$LINENO" 5 fi @@ -3797,8 +3782,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3912,8 +3897,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3955,8 +3941,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -4013,9 +3999,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. +as_fn_error "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details." "$LINENO" 5; } fi fi fi @@ -4066,8 +4052,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4399,7 +4385,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4415,11 +4401,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4458,7 +4444,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4474,18 +4460,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -4546,7 +4532,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4612,7 +4598,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4744,7 +4730,8 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -4988,7 +4975,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5004,11 +4991,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -5047,7 +5034,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5063,18 +5050,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -5511,7 +5498,7 @@ if test "x${with_makeinfo}" = "xno"; then MAKEINFO=off elif test ! -e $srcdir/info/emacs; then - as_fn_error $? "You do not seem to have makeinfo >= 4.6, and your + as_fn_error "You do not seem to have makeinfo >= 4.6, and your source tree does not seem to have pre-built manuals in the \`info' directory. Either install a suitable version of makeinfo, or re-run configure with the \`--without-makeinfo' option to build without the manuals. " "$LINENO" 5 @@ -5670,7 +5657,7 @@ if test "x$GCC" = "xyes"; then C_SWITCH_MACHINE="-fno-common" else - as_fn_error $? "What gives? Fix me if DEC Unix supports ELF now." "$LINENO" 5 + as_fn_error "What gives? Fix me if DEC Unix supports ELF now." "$LINENO" 5 fi else UNEXEC_OBJ=unexalpha.o @@ -5948,7 +5935,7 @@ ## Some platforms don't use any of these files, so it is not ## appropriate to put this test outside the if block. test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \ - as_fn_error $? "crt*.o not found in specified location." "$LINENO" 5 + as_fn_error "crt*.o not found in specified location." "$LINENO" 5 fi @@ -6003,7 +5990,8 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -6194,7 +6182,7 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$emacs_alsa_subdir" != yes; then - as_fn_error $? "pkg-config found alsa, but it does not compile. See config.log for error messages." "$LINENO" 5 + as_fn_error "pkg-config found alsa, but it does not compile. See config.log for error messages." "$LINENO" 5 fi ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" fi @@ -6229,7 +6217,8 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7284,8 +7273,8 @@ ;; #( *) - as_fn_error $? "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + as_fn_error "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac @@ -7293,7 +7282,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -7301,7 +7290,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -7437,7 +7426,7 @@ have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( + *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -7455,7 +7444,7 @@ @echo libdir='${LIBDIR}' _ACEOF if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. for ac_var in incroot usrlibdir libdir; do eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done @@ -7541,7 +7530,7 @@ fi done fi -rm -f conftest.err conftest.i conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext fi # $ac_x_includes = no if test "$ac_x_libraries" = no; then @@ -7702,7 +7691,7 @@ elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes ns_appdir=`pwd`/nextstep/Emacs.app - ns_appbindir=${ns_appdir} + ns_appbindir=${ns_appdir}/ ns_appresdir=${ns_appdir}/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" @@ -7724,7 +7713,7 @@ if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then : HAVE_NS=yes else - as_fn_error $? "\`--with-ns' was specified, but the include + as_fn_error "\`--with-ns' was specified, but the include files are missing or cannot be compiled." "$LINENO" 5 fi @@ -7840,7 +7829,7 @@ if test "$HAVE_XSERVER" = true || test -n "$DISPLAY" || test "`echo /usr/lib/libX11.*`" != "/usr/lib/libX11.*"; then - as_fn_error $? "You seem to be running X, but no X development libraries + as_fn_error "You seem to be running X, but no X development libraries were found. You should install the relevant development files for X and for the toolkit you want, such as Gtk+, Lesstif or Motif. Also make sure you have development files for image handling, i.e. @@ -7963,7 +7952,8 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -8069,7 +8059,6 @@ main () { char *data, *data2, *data3; - const char *cdata2; int i, pagesize; int fd, fd2; @@ -8094,10 +8083,10 @@ fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); if (fd2 < 0) return 4; - cdata2 = ""; - if (write (fd2, cdata2, 1) != 1) + data2 = ""; + if (write (fd2, data2, 1) != 1) return 5; - data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); if (data2 == MAP_FAILED) return 6; for (i = 0; i < pagesize; ++i) @@ -8470,7 +8459,8 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -8872,7 +8862,7 @@ fi if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then - as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5 + as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5 fi fi @@ -8978,7 +8968,7 @@ fi if test "$pkg_check_gtk" = "no" && test "$USE_X_TOOLKIT" != "maybe"; then - as_fn_error $? "$GTK_PKG_ERRORS" "$LINENO" 5 + as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5 fi fi fi @@ -9005,7 +8995,7 @@ if test "${GTK_COMPILES}" != "yes"; then if test "$USE_X_TOOLKIT" != "maybe"; then - as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5 ; + as_fn_error "Gtk+ wanted, but it does not compile, see config.log. Maybe some x11-devel files missing?" "$LINENO" 5; fi else HAVE_GTK=yes @@ -9135,7 +9125,8 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -9616,7 +9607,7 @@ USE_X_TOOLKIT=LUCID LUCID_LIBW=-lXaw elif test x"${USE_X_TOOLKIT}" = xLUCID; then - as_fn_error $? "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5 + as_fn_error "Lucid toolkit requires X11/Xaw include files" "$LINENO" 5 else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; do not use toolkit by default" >&5 $as_echo "no; do not use toolkit by default" >&6; } @@ -10793,7 +10784,8 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -11045,7 +11037,7 @@ MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no" if test "X${MISSING}" != X; then - as_fn_error $? "The following required libraries were not found: + as_fn_error "The following required libraries were not found: $MISSING Maybe some development libraries/packages are missing? If you don't want to link with them give @@ -11534,7 +11526,8 @@ for ac_func in _getb67 GETB67 getb67; do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func @@ -11598,7 +11591,7 @@ if test x"$ac_cv_func_alloca_works" != xyes; then - as_fn_error $? "a system implementation of alloca is required " "$LINENO" 5 + as_fn_error "a system implementation of alloca is required " "$LINENO" 5 fi # fmod, logb, and frexp are found in -lm on most systems. @@ -11794,7 +11787,7 @@ if test $ac_cv_prog_liblockfile = yes; then - as_fn_error $? "Shared liblockfile found but can't link against it. + as_fn_error "Shared liblockfile found but can't link against it. This probably means that movemail could lose mail. There may be a \`development' package to install containing liblockfile." "$LINENO" 5 fi @@ -11883,7 +11876,8 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -11914,7 +11908,8 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -11966,8 +11961,8 @@ static time_t time_t_min; /* Values we'll use to set the TZ environment variable. */ -static const char *tz_strings[] = { - (const char *) 0, "TZ=GMT0", "TZ=JST-9", +static char *tz_strings[] = { + (char *) 0, "TZ=GMT0", "TZ=JST-9", "TZ=EST+3EDT+2,M10.1.0/00:00:00,M2.3.0/00:00:00" }; #define N_STRINGS (sizeof (tz_strings) / sizeof (tz_strings[0])) @@ -11984,7 +11979,7 @@ instead of "TZ=America/Vancouver" in order to detect the bug even on systems that don't support the Olson extension, or don't have the full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); + putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); tm.tm_year = 98; tm.tm_mon = 3; @@ -11997,14 +11992,16 @@ } static int -mktime_test1 (time_t now) +mktime_test1 (now) + time_t now; { struct tm *lt; return ! (lt = localtime (&now)) || mktime (lt) == now; } static int -mktime_test (time_t now) +mktime_test (now) + time_t now; { return (mktime_test1 (now) && mktime_test1 ((time_t) (time_t_max - now)) @@ -12028,7 +12025,8 @@ } static int -bigtime_test (int j) +bigtime_test (j) + int j; { struct tm tm; time_t now; @@ -12072,7 +12070,7 @@ instead of "TZ=America/Vancouver" in order to detect the bug even on systems that don't support the Olson extension, or don't have the full zoneinfo tables installed. */ - putenv ((char*) "TZ=PST8PDT,M4.1.0,M10.5.0"); + putenv ("TZ=PST8PDT,M4.1.0,M10.5.0"); t = mktime (&tm); @@ -12107,7 +12105,7 @@ for (i = 0; i < N_STRINGS; i++) { if (tz_strings[i]) - putenv ((char*) tz_strings[i]); + putenv (tz_strings[i]); for (t = 0; t <= time_t_max - delta; t += delta) if (! mktime_test (t)) @@ -12159,7 +12157,7 @@ # Make sure getloadavg.c is where it belongs, at configure-time. test -f "$srcdir/$ac_config_libobj_dir/getloadavg.c" || - as_fn_error $? "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5 + as_fn_error "$srcdir/$ac_config_libobj_dir/getloadavg.c is missing" "$LINENO" 5 ac_save_LIBS=$LIBS @@ -13028,7 +13026,7 @@ fi if test "$have_tputs_et_al" != true; then - as_fn_error $? "I couldn't find termcap functions (tputs and friends). + as_fn_error "I couldn't find termcap functions (tputs and friends). Maybe some development libraries/packages are missing? Try installing libncurses-dev(el), libterminfo-dev(el) or similar." "$LINENO" 5 fi @@ -14167,7 +14165,8 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -14541,14 +14540,14 @@ && test x"`$CC --version 2> /dev/null | grep 'gcc.* 4.5.0'`" != x \ && test x"`echo $CFLAGS | grep '\-O[23]'`" != x \ && test x"`echo $CFLAGS | grep '\-fno-optimize-sibling-calls'`" = x; then - as_fn_error $? "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5 + as_fn_error "GCC 4.5.0 has problems compiling Emacs; see etc/PROBLEMS'." "$LINENO" 5 fi #### Find out which version of Emacs this is. version=`grep 'const char emacs_version' ${srcdir}/src/emacs.c \ | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` if test x"${version}" = x; then - as_fn_error $? "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5 + as_fn_error "can't find current emacs version in \`${srcdir}/src/emacs.c'." "$LINENO" 5 fi if test x"${version}" != x"$PACKAGE_VERSION"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: version mismatch between \`${srcdir}/configure.in' and \`${srcdir}/src/emacs.c'." >&5 @@ -15104,7 +15103,6 @@ ac_libobjs= ac_ltlibobjs= -U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -15267,19 +15265,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error STATUS ERROR [LINENO LOG_FD] -# ---------------------------------------- +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with STATUS, using 1 if that was 0. +# script with status $?, using 1 if that was 0. as_fn_error () { - as_status=$1; test $as_status -eq 0 && as_status=1 - if test "$4"; then - as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 fi - $as_echo "$as_me: error: $2" >&2 + $as_echo "$as_me: error: $1" >&2 as_fn_exit $as_status } # as_fn_error @@ -15475,7 +15473,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -15529,7 +15527,7 @@ # values after options handling. ac_log=" This file was extended by emacs $as_me 24.0.50, which was -generated by GNU Autoconf 2.67. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15595,10 +15593,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ emacs config.status 24.0.50 -configured by $0, generated by GNU Autoconf 2.67, +configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15614,16 +15612,11 @@ while test $# != 0 do case $1 in - --*=?*) + --*=*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; - --*=) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg= - ac_shift=: - ;; *) ac_option=$1 ac_optarg=$2 @@ -15645,7 +15638,6 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -15658,7 +15650,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error $? "ambiguous option: \`$1' + as_fn_error "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -15667,7 +15659,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error $? "unrecognized option: \`$1' + -*) as_fn_error "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -15735,7 +15727,7 @@ "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -15773,7 +15765,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -15807,7 +15799,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi @@ -15824,7 +15816,7 @@ echo "_ACEOF" } >conf$$files.sh && . ./conf$$files.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 rm -f conf$$files.sh { @@ -15832,18 +15824,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -15938,28 +15930,20 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove sole $(srcdir), -# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ -h -s/// -s/^/:/ -s/[ ]*$/:/ -s/:\$(srcdir):/:/g -s/:\${srcdir}:/:/g -s/:@srcdir@:/:/g -s/^:*// + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ s/:*$// -x -s/\(=[ ]*\).*/\1/ -G -s/\n// s/^[^=]*=[ ]*$// }' fi @@ -15987,7 +15971,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -16072,7 +16056,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 + as_fn_error "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -16085,7 +16069,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -16113,7 +16097,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -16140,7 +16124,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -16276,22 +16260,22 @@ else $AWK -f "$tmp/subs.awk" | $SHELL fi >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&5 +which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined" >&2;} +which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -16302,19 +16286,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error $? "could not create -" "$LINENO" 5 + || as_fn_error "could not create -" "$LINENO" 5 fi ;; @@ -16351,7 +16335,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -16372,7 +16356,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit 1 + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 === modified file 'configure.in' --- configure.in 2010-11-21 05:17:19 +0000 +++ configure.in 2010-11-21 14:39:55 +0000 @@ -1498,7 +1498,7 @@ elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes ns_appdir=`pwd`/nextstep/Emacs.app - ns_appbindir=${ns_appdir} + ns_appbindir=${ns_appdir}/ ns_appresdir=${ns_appdir}/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base dnl FIXME sourcing this several times in subshells seems inefficient. ------------------------------------------------------------ revno: 102462 committer: Jan D. branch nick: trunk timestamp: Sun 2010-11-21 14:09:34 +0100 message: Add separate key mappings for left/right control/command on Nextstep (Bug#7458). * lisp/cus-start.el (all): Add ns-right-control-modifier and ns-right-command-modifier. * lisp/term/ns-win.el (ns-right-control-modifier) (ns-right-command-modifier): Defvar them. * src/nsterm.m (ns_right_command_modifier, ns_right_control_modifier): Define (Bug#7458). (NSRightCommandKeyMask, NSRightControlKeyMask): Define (Bug#7458). (EV_MODIFIERS): Check for NSRightCommandKeyMask and NSRightControlKeyMask also (Bug#7458). (keyDown): Ditto (Bug#7458). (syms_of_nsterm): Defvar ns-right-command-modifier and ns-right-control-modifier (Bug#7458). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-20 22:27:56 +0000 +++ lisp/ChangeLog 2010-11-21 13:09:34 +0000 @@ -1,3 +1,11 @@ +2010-11-21 Jan Djärv + + * term/ns-win.el (ns-right-control-modifier) + (ns-right-command-modifier): Defvar them. + + * cus-start.el (all): Add ns-right-control-modifier and + ns-right-command-modifier (Bug#7458). + 2010-11-20 Glenn Morris * emacs-lisp/authors.el (authors-ignored-files) === modified file 'lisp/cus-start.el' --- lisp/cus-start.el 2010-10-31 22:47:12 +0000 +++ lisp/cus-start.el 2010-11-21 13:09:34 +0000 @@ -320,12 +320,28 @@ (const control) (const meta) (const alt) (const hyper) (const super)) "23.1") + (ns-right-control-modifier + ns + (choice (const :tag "No modifier (work as control)" none) + (const :tag "Use the value of ns-control-modifier" + left) + (const control) (const meta) + (const alt) (const hyper) + (const super)) "24.0") (ns-command-modifier ns (choice (const :tag "No modifier" nil) (const control) (const meta) (const alt) (const hyper) (const super)) "23.1") + (ns-right-command-modifier + ns + (choice (const :tag "No modifier (work as command)" none) + (const :tag "Use the value of ns-command-modifier" + left) + (const control) (const meta) + (const alt) (const hyper) + (const super)) "24.0") (ns-alternate-modifier ns (choice (const :tag "No modifier (work as alternate/option)" none) === modified file 'lisp/term/ns-win.el' --- lisp/term/ns-win.el 2010-10-28 07:05:00 +0000 +++ lisp/term/ns-win.el 2010-11-21 13:09:34 +0000 @@ -179,7 +179,9 @@ (defvaralias 'mac-allow-anti-aliasing 'ns-antialias-text) (defvaralias 'mac-command-modifier 'ns-command-modifier) +(defvaralias 'mac-right-command-modifier 'ns-right-command-modifier) (defvaralias 'mac-control-modifier 'ns-control-modifier) +(defvaralias 'mac-right-control-modifier 'ns-right-control-modifier) (defvaralias 'mac-option-modifier 'ns-option-modifier) (defvaralias 'mac-right-option-modifier 'ns-right-option-modifier) (defvaralias 'mac-function-modifier 'ns-function-modifier) @@ -514,6 +516,8 @@ ;; nsterm.m (defvar ns-alternate-modifier) (defvar ns-right-alternate-modifier) +(defvar ns-right-command-modifier) +(defvar ns-right-control-modifier) ;; You say tomAYto, I say tomAHto.. (defvaralias 'ns-option-modifier 'ns-alternate-modifier) === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-21 05:39:01 +0000 +++ src/ChangeLog 2010-11-21 13:09:34 +0000 @@ -1,3 +1,14 @@ +2010-11-21 Jan Djärv + + * nsterm.m (ns_right_command_modifier, ns_right_control_modifier): + Define (Bug#7458). + (NSRightCommandKeyMask, NSRightControlKeyMask): Define (Bug#7458). + (EV_MODIFIERS): Check for NSRightCommandKeyMask and + NSRightControlKeyMask also (Bug#7458). + (keyDown): Ditto (Bug#7458). + (syms_of_nsterm): Defvar ns-right-command-modifier and + ns-right-control-modifier (Bug#7458). + 2010-11-21 Dan Nicolaescu * sysdep.c (sys_subshell): Remove SET_EMACS_PRIORITY. === modified file 'src/nsterm.m' --- src/nsterm.m 2010-11-06 08:28:31 +0000 +++ src/nsterm.m 2010-11-21 13:09:34 +0000 @@ -158,10 +158,20 @@ Lisp_Object ns_command_modifier; /* Specifies which emacs modifier should be generated when NS receives + the right Command modifier. Has same values as ns_command_modifier plus + the value Qleft which means whatever value ns_command_modifier has. */ +Lisp_Object ns_right_command_modifier; + +/* Specifies which emacs modifier should be generated when NS receives the Control modifier. May be any of the modifier lisp symbols. */ Lisp_Object ns_control_modifier; /* Specifies which emacs modifier should be generated when NS receives + the right Control modifier. Has same values as ns_control_modifier plus + the value Qleft which means whatever value ns_control_modifier has. */ +Lisp_Object ns_right_control_modifier; + +/* Specifies which emacs modifier should be generated when NS receives the Function modifier (laptops). May be any of the modifier lisp symbols. */ Lisp_Object ns_function_modifier; @@ -224,6 +234,8 @@ /* Convert modifiers in a NeXTSTEP event to emacs style modifiers. */ #define NS_FUNCTION_KEY_MASK 0x800000 #define NSRightAlternateKeyMask (0x000040 | NSAlternateKeyMask) +#define NSRightControlKeyMask (0x002000 | NSControlKeyMask) +#define NSRightCommandKeyMask (0x000010 | NSCommandKeyMask) #define EV_MODIFIERS(e) \ ((([e modifierFlags] & NSHelpKeyMask) ? \ hyper_modifier : 0) \ @@ -235,10 +247,18 @@ parse_solitary_modifier (ns_alternate_modifier) : 0) \ | (([e modifierFlags] & NSShiftKeyMask) ? \ shift_modifier : 0) \ + | (!EQ (ns_right_control_modifier, Qleft) && \ + (([e modifierFlags] & NSRightControlKeyMask) \ + == NSRightControlKeyMask) ? \ + parse_solitary_modifier (ns_right_control_modifier) : 0) \ | (([e modifierFlags] & NSControlKeyMask) ? \ parse_solitary_modifier (ns_control_modifier) : 0) \ | (([e modifierFlags] & NS_FUNCTION_KEY_MASK) ? \ parse_solitary_modifier (ns_function_modifier) : 0) \ + | (!EQ (ns_right_command_modifier, Qleft) && \ + (([e modifierFlags] & NSRightCommandKeyMask) \ + == NSRightCommandKeyMask) ? \ + parse_solitary_modifier (ns_right_command_modifier) : 0) \ | (([e modifierFlags] & NSCommandKeyMask) ? \ parse_solitary_modifier (ns_command_modifier):0)) @@ -4424,7 +4444,14 @@ if (flags & NSCommandKeyMask) { - emacs_event->modifiers |= parse_solitary_modifier (ns_command_modifier); + if ((flags & NSRightCommandKeyMask) == NSRightCommandKeyMask + && !EQ (ns_right_command_modifier, Qleft)) + emacs_event->modifiers |= parse_solitary_modifier + (ns_right_command_modifier); + else + emacs_event->modifiers |= parse_solitary_modifier + (ns_command_modifier); + /* if super (default), take input manager's word so things like dvorak / qwerty layout work */ if (EQ (ns_command_modifier, Qsuper) @@ -4458,8 +4485,15 @@ } if (flags & NSControlKeyMask) - emacs_event->modifiers |= - parse_solitary_modifier (ns_control_modifier); + { + if ((flags & NSRightControlKeyMask) == NSRightControlKeyMask + && !EQ (ns_right_control_modifier, Qleft)) + emacs_event->modifiers |= parse_solitary_modifier + (ns_right_control_modifier); + else + emacs_event->modifiers |= parse_solitary_modifier + (ns_control_modifier); + } if (flags & NS_FUNCTION_KEY_MASK && !fnKeysym) emacs_event->modifiers |= @@ -6246,11 +6280,27 @@ Set to control, meta, alt, super, or hyper means it is taken to be that key."); ns_command_modifier = Qsuper; + DEFVAR_LISP ("ns-right-command-modifier", &ns_right_command_modifier, + "This variable describes the behavior of the right command key.\n\ +Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\ +Set to left means be the same key as `ns-command-modifier'.\n\ +Set to none means that the command / option key is not interpreted by Emacs\n\ +at all, allowing it to be used at a lower level for accented character entry."); + ns_right_command_modifier = Qleft; + DEFVAR_LISP ("ns-control-modifier", &ns_control_modifier, "This variable describes the behavior of the control key.\n\ Set to control, meta, alt, super, or hyper means it is taken to be that key."); ns_control_modifier = Qcontrol; + DEFVAR_LISP ("ns-right-control-modifier", &ns_right_control_modifier, + "This variable describes the behavior of the right control key.\n\ +Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\ +Set to left means be the same key as `ns-control-modifier'.\n\ +Set to none means that the control / option key is not interpreted by Emacs\n\ +at all, allowing it to be used at a lower level for accented character entry."); + ns_right_control_modifier = Qleft; + DEFVAR_LISP ("ns-function-modifier", &ns_function_modifier, "This variable describes the behavior of the function key (on laptops).\n\ Set to control, meta, alt, super, or hyper means it is taken to be that key.\n\ ------------------------------------------------------------ revno: 102461 committer: Ralf Angeli branch nick: trunk timestamp: Sun 2010-11-21 09:51:04 +0100 message: Gnus: Fix display of message insertion marks. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-21 07:11:35 +0000 +++ lisp/gnus/ChangeLog 2010-11-21 08:51:04 +0000 @@ -1,3 +1,8 @@ +2010-11-21 Ralf Angeli + + * mm-uu.el (mm-uu-type-alist): Prevent spurious empty line from + appearing when `mm-uu-hide-markers' is nil. + 2010-11-21 Lars Magne Ingebrigtsen * nnimap.el (nnimap-unselect-group): Made into its own function. === modified file 'lisp/gnus/mm-uu.el' --- lisp/gnus/mm-uu.el 2010-09-02 01:42:32 +0000 +++ lisp/gnus/mm-uu.el 2010-11-21 08:51:04 +0000 @@ -165,7 +165,7 @@ ;; dependency on `message.el'. "^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$" "^-+[8<>]*-\\{9,\\}[a-z ]+-\\{9,\\}[a-z ]+-\\{9,\\}[8<>]*-+$" - (lambda () (mm-uu-verbatim-marks-extract -1 0 1 -1)) + (lambda () (mm-uu-verbatim-marks-extract 0 0 1 -1)) nil) ;; Omitting [a-z8<] leads to false positives (bogus signature separators ;; and mailing list banners). ------------------------------------------------------------ revno: 102460 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2010-11-21 07:11:35 +0000 message: nnimap.el (nnimap-unselect-group): Made into its own function. (nnimap-request-rename-group): Unselect group before renaming. This had gotten lost somewhere. (nnimap-request-accept-article): Keep track of examined groups, and unselect the group before APPENDing to read-only groups. (nnimap-request-move-article): Clear flags before moving so that they can be re-set later. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-20 22:25:56 +0000 +++ lisp/gnus/ChangeLog 2010-11-21 07:11:35 +0000 @@ -1,3 +1,13 @@ +2010-11-21 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-unselect-group): Made into its own function. + (nnimap-request-rename-group): Unselect group before renaming. This + had gotten lost somewhere. + (nnimap-request-accept-article): Keep track of examined groups, and + unselect the group before APPENDing to read-only groups. + (nnimap-request-move-article): Clear flags before moving so that they + can be re-set later. + 2010-11-20 Katsumi Yamaoka * gnus-gravatar.el (gnus-gravatar-transform-address): Decode name again. === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-11-10 23:16:01 +0000 +++ lisp/gnus/nnimap.el 2010-11-21 07:11:35 +0000 @@ -125,7 +125,7 @@ (defstruct nnimap group process commands capabilities select-result newlinep server - last-command-time greeting) + last-command-time greeting examined) (defvar nnimap-object nil) @@ -727,13 +727,17 @@ (deffoo nnimap-request-rename-group (group new-name &optional server) (when (nnimap-possibly-change-group nil server) (with-current-buffer (nnimap-buffer) - ;; Make sure we don't have this group open read/write by asking - ;; to examine a mailbox that doesn't exist. This seems to be - ;; the only way that allows us to reliably go back to unselected - ;; state on Courier. + (nnimap-unselect-group) (car (nnimap-command "RENAME %S %S" (utf7-encode group t) (utf7-encode new-name t)))))) +(defun nnimap-unselect-group () + ;; Make sure we don't have this group open read/write by asking + ;; to examine a mailbox that doesn't exist. This seems to be + ;; the only way that allows us to reliably go back to unselected + ;; state on Courier. + (nnimap-command "EXAMINE DOES.NOT.EXIST")) + (deffoo nnimap-request-expunge-group (group &optional server) (when (nnimap-possibly-change-group group server) (with-current-buffer (nnimap-buffer) @@ -774,6 +778,9 @@ (if internal-move-group (let ((result (with-current-buffer (nnimap-buffer) + ;; Clear all flags before moving. + (nnimap-send-command "UID STORE %d FLAGS.SILENT ()" + article) (nnimap-command "UID COPY %d %S" article (utf7-encode internal-move-group t))))) @@ -863,6 +870,7 @@ (erase-buffer) (unless (equal group (nnimap-group nnimap-object)) (setf (nnimap-group nnimap-object) nil) + (setf (nnimap-examined nnimap-object) group) (nnimap-send-command "EXAMINE %S" (utf7-encode group t))) (let ((sequence (nnimap-send-command "UID SEARCH HEADER Message-Id %S" message-id)) @@ -936,6 +944,10 @@ (nnimap-add-cr) (setq message (buffer-substring-no-properties (point-min) (point-max))) (with-current-buffer (nnimap-buffer) + ;; If we have this group open read-only, then unselect it + ;; before appending to it. + (when (equal (nnimap-examined nnimap-object) group) + (nnimap-unselect-group)) (erase-buffer) (setq sequence (nnimap-send-command "APPEND %S {%d}" (utf7-encode group t) @@ -994,6 +1006,7 @@ (with-current-buffer (nnimap-buffer) (setf (nnimap-group nnimap-object) nil) (dolist (group groups) + (setf (nnimap-examined nnimap-object) group) (push (list (nnimap-send-command "EXAMINE %S" (utf7-encode group t)) group) sequences)) @@ -1052,6 +1065,7 @@ active (cdr (assq 'active params)) uidvalidity (cdr (assq 'uidvalidity params)) modseq (cdr (assq 'modseq params))) + (setf (nnimap-examined nnimap-object) group) (if (and qresyncp uidvalidity modseq) ------------------------------------------------------------ revno: 102459 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-11-20 21:39:01 -0800 message: Remove emacs-priority. * src/sysdep.c (sys_subshell): Remove SET_EMACS_PRIORITY. * src/emacs.c (emacs_priority, syms_of_emacs): Remove emacs_priority. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-21 05:20:50 +0000 +++ src/ChangeLog 2010-11-21 05:39:01 +0000 @@ -1,5 +1,8 @@ 2010-11-21 Dan Nicolaescu + * sysdep.c (sys_subshell): Remove SET_EMACS_PRIORITY. + * emacs.c (emacs_priority, syms_of_emacs): Remove emacs_priority. + * intervals.h (temp_set_point, temp_set_point_both): * buffer.h (offset_intervals, copy_intervals): Remove INLINE. === modified file 'src/emacs.c' --- src/emacs.c 2010-11-15 06:10:35 +0000 +++ src/emacs.c 2010-11-21 05:39:01 +0000 @@ -195,11 +195,6 @@ but instead should use the virtual terminal under which it was started. */ int inhibit_window_system; -/* If nonzero, set Emacs to run at this priority. This is also used - in child_setup and sys_suspend to make sure subshells run at normal - priority; those functions have their own extern declaration. */ -EMACS_INT emacs_priority; - /* If non-zero, a filter or a sentinel is running. Tested to save the match data on the first attempt to change it inside asynchronous code. */ int running_asynch_code; @@ -2439,15 +2434,6 @@ `noninteractive' was non-nil. */); Vkill_emacs_hook = Qnil; - DEFVAR_INT ("emacs-priority", &emacs_priority, - doc: /* Priority for Emacs to run at. -This value is effective only if set before Emacs is dumped, -and only if the Emacs executable is installed with setuid to permit -it to change priority. (Emacs sets its uid back to the real uid.) -Currently, you need to define SET_EMACS_PRIORITY in `config.h' -before you compile Emacs, to enable the code for this feature. */); - emacs_priority = 0; - DEFVAR_LISP ("path-separator", &Vpath_separator, doc: /* String containing the character that separates directories in search paths, such as PATH and other similar environment variables. */); === modified file 'src/sysdep.c' --- src/sysdep.c 2010-11-15 06:10:35 +0000 +++ src/sysdep.c 2010-11-21 05:39:01 +0000 @@ -554,15 +554,6 @@ close_process_descs (); /* Close Emacs's pipes/ptys */ -#ifdef SET_EMACS_PRIORITY - { - extern EMACS_INT emacs_priority; - - if (emacs_priority < 0) - nice (-emacs_priority); - } -#endif - #ifdef MSDOS /* Demacs 1.1.2 91/10/20 Manabu Higashida */ { char *epwd = getenv ("PWD"); ------------------------------------------------------------ revno: 102458 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-11-20 21:20:50 -0800 message: Remove INLINE uses in header files. * src/intervals.h (temp_set_point, temp_set_point_both): * src/buffer.h (offset_intervals, copy_intervals): Remove INLINE. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-20 15:23:49 +0000 +++ src/ChangeLog 2010-11-21 05:20:50 +0000 @@ -1,3 +1,8 @@ +2010-11-21 Dan Nicolaescu + + * intervals.h (temp_set_point, temp_set_point_both): + * buffer.h (offset_intervals, copy_intervals): Remove INLINE. + 2010-11-20 Ken Brown * sheap.c (STATIC_HEAP_SIZE): Increase to 13MB. === modified file 'src/buffer.h' --- src/buffer.h 2010-11-03 03:40:54 +0000 +++ src/buffer.h 2010-11-21 05:20:50 +0000 @@ -227,10 +227,10 @@ (temp_set_point ((buffer), (position))) extern void set_point (EMACS_INT); -extern INLINE void temp_set_point (struct buffer *, EMACS_INT); +extern void temp_set_point (struct buffer *, EMACS_INT); extern void set_point_both (EMACS_INT, EMACS_INT); -extern INLINE void temp_set_point_both (struct buffer *, - EMACS_INT, EMACS_INT); +extern void temp_set_point_both (struct buffer *, + EMACS_INT, EMACS_INT); extern void enlarge_buffer_text (struct buffer *, EMACS_INT); === modified file 'src/intervals.h' --- src/intervals.h 2010-09-23 18:50:57 +0000 +++ src/intervals.h 2010-11-21 05:20:50 +0000 @@ -264,12 +264,12 @@ extern INTERVAL merge_interval_left (INTERVAL); extern INTERVAL merge_interval_right (INTERVAL); extern void delete_interval (INTERVAL); -extern INLINE void offset_intervals (struct buffer *, EMACS_INT, EMACS_INT); +extern void offset_intervals (struct buffer *, EMACS_INT, EMACS_INT); extern void graft_intervals_into_buffer (INTERVAL, EMACS_INT, EMACS_INT, struct buffer *, int); extern void verify_interval_modification (struct buffer *, int, int); extern INTERVAL balance_intervals (INTERVAL); -extern INLINE void copy_intervals_to_string (Lisp_Object, struct buffer *, +extern void copy_intervals_to_string (Lisp_Object, struct buffer *, EMACS_INT, EMACS_INT); extern INTERVAL copy_intervals (INTERVAL, EMACS_INT, EMACS_INT); extern int compare_string_intervals (Lisp_Object, Lisp_Object); ------------------------------------------------------------ revno: 102457 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-11-20 21:17:19 -0800 message: * configure.in (INLINE): Do not depend on OPTIMIZE, unused. diff: === modified file 'ChangeLog' --- ChangeLog 2010-11-18 03:54:14 +0000 +++ ChangeLog 2010-11-21 05:17:19 +0000 @@ -1,3 +1,7 @@ +2010-11-21 Dan Nicolaescu + + * configure.in (INLINE): Do not depend on OPTIMIZE, unused. + 2010-11-15 Dan Nicolaescu * configure.in: Do not check for unconditionally included headers. === modified file 'configure.in' --- configure.in 2010-11-18 03:54:14 +0000 +++ configure.in 2010-11-21 05:17:19 +0000 @@ -3511,7 +3511,7 @@ /* Don't try to switch on inline handling as detected by AC_C_INLINE generally, because even if non-gcc compilers accept `inline', they may reject `extern inline'. */ -#if defined (__GNUC__) && defined (OPTIMIZE) +#if defined (__GNUC__) #define INLINE __inline__ #else #define INLINE === modified file 'src/config.in' --- src/config.in 2010-11-18 03:54:14 +0000 +++ src/config.in 2010-11-21 05:17:19 +0000 @@ -1076,7 +1076,7 @@ /* Don't try to switch on inline handling as detected by AC_C_INLINE generally, because even if non-gcc compilers accept `inline', they may reject `extern inline'. */ -#if defined (__GNUC__) && defined (OPTIMIZE) +#if defined (__GNUC__) #define INLINE __inline__ #else #define INLINE ------------------------------------------------------------ revno: 102456 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-11-20 14:29:35 -0800 message: diary-lib comments. diff: === modified file 'lisp/calendar/diary-lib.el' --- lisp/calendar/diary-lib.el 2010-09-30 02:18:24 +0000 +++ lisp/calendar/diary-lib.el 2010-11-20 22:29:35 +0000 @@ -1,7 +1,8 @@ ;;; diary-lib.el --- diary functions ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 +;; Free Software Foundation, Inc. ;; Author: Edward M. Reingold ;; Maintainer: Glenn Morris @@ -2331,6 +2332,7 @@ ;;; Fancy Diary Mode. +;; FIXME does not update upon changes to the name-arrays. (defvar diary-fancy-date-pattern (concat (let ((dayname (diary-name-pattern calendar-day-name-array nil t)) @@ -2433,9 +2435,6 @@ (setq format-string (cdr (nth i diary-outlook-formats))) (save-excursion (save-window-excursion - ;; Fixme: References to optional fields in the format - ;; are treated literally, not replaced by the empty - ;; string. I think this is an Emacs bug. (diary-make-entry (format (replace-match (if (functionp format-string) (funcall format-string body) @@ -2513,5 +2512,4 @@ (provide 'diary-lib) -;; arch-tag: 22dd506e-2e33-410d-9ae1-095a0c1b2010 ;;; diary-lib.el ends here ------------------------------------------------------------ revno: 102455 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-11-20 14:27:56 -0800 message: Tiny authors.el updates. * lisp/emacs-lisp/authors.el (authors-ignored-files) (authors-valid-file-names, authors-renamed-files-alist): Add entries. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-20 22:25:56 +0000 +++ lisp/ChangeLog 2010-11-20 22:27:56 +0000 @@ -1,3 +1,8 @@ +2010-11-20 Glenn Morris + + * emacs-lisp/authors.el (authors-ignored-files) + (authors-valid-file-names, authors-renamed-files-alist): Add entries. + 2010-11-20 Tassilo Horn * mail/emacsbug.el (report-emacs-bug-query-existing-bugs) === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2010-10-09 01:15:15 +0000 +++ lisp/emacs-lisp/authors.el 2010-11-20 22:27:56 +0000 @@ -268,6 +268,7 @@ "CODINGS" "CHARSETS" "calc/INSTALL" "calc/Makefile" "vms-pp.trans" "_emacs" "batcomp.com" "notes/cpp" ; admin/ + "emacsver.texi.in" ;; MH-E stuff not in Emacs: "import-emacs" "release-utils" ;; Erc stuff not in Emacs: @@ -507,10 +508,11 @@ "ymakefile" "permute-index" "index.perm" "ibmrs6000.inp" - "b2m.c" + "b2m.c" "b2m.1" "b2m.pl" + "emacs.bash" "emacs.csh" "ms-kermit" "emacs.ico" "emacs21.ico" - "LPF" "LEDIT" "OTHER.EMACSES" + "BABYL" "LPF" "LEDIT" "OTHER.EMACSES" "emacs16_mac.png" "emacs24_mac.png" "emacs256_mac.png" "emacs32_mac.png" "emacs48_mac.png" "emacs512_mac.png" @@ -585,12 +587,15 @@ ("schema/docbook-soextbl.rnc" . "schema/docbk-soextbl.rn" ) ("texi/url.txi" . "url.texi") ("edt-user.doc" . "edt.texi") + ("DEV-NOTES" . "nextstep") ;; Moved to different directories. ("ctags.1" . "ctags.1") ("etags.1" . "etags.1") ("emacs.1" . "emacs.1") ("emacsclient.1" . "emacsclient.1") ("icons/emacs21.ico" . "emacs21.ico") + ;; Moved from admin/nt/ to nt/. + ("nt/README.W32" . "README.W32") ) "Alist of files which have been renamed during their lifetime. Elements are (OLDNAME . NEWNAME).") ------------------------------------------------------------ revno: 102454 committer: Glenn Morris branch nick: trunk timestamp: Sat 2010-11-20 14:25:56 -0800 message: ChangeLog fixes prompted by M-x authors. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-20 17:32:57 +0000 +++ lisp/ChangeLog 2010-11-20 22:25:56 +0000 @@ -4975,9 +4975,6 @@ 2010-07-31 Nathaniel Flath - Enhance Java Mode to handle Java 5.0 (Tiger) and Java 6 (Mustang). - The following functions were modified or created: - * progmodes/cc-vars.el (c-offsets-alist, c-inside-block-syms) (objc-font-lock-extra-types): * progmodes/cc-mode.el (c-basic-common-init): @@ -4993,6 +4990,8 @@ (c-forward-<>-arglist, c-forward-<>-arglist-recur) (c-forward-name, c-forward-type, c-forward-decl-or-cast-1) (c-guess-continued-construct, c-guess-basic-syntax): + Enhance Java Mode to handle Java 5.0 (Tiger) and Java 6 (Mustang). + The above functions were modified or created. 2010-07-31 Jan Djärv === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-20 01:18:17 +0000 +++ lisp/gnus/ChangeLog 2010-11-20 22:25:56 +0000 @@ -484,11 +484,11 @@ 2010-10-30 Andrew Cohen - * nnir.el move defvar, defcustom around to keep file organized and keep - byte-compiler quiet. - (nnir-read-parms): accept search-engine as arg. - (nnir-run-query): pass search-engine as arg. - (nnir-search-engine): remove. + * nnir.el: Move defvar, defcustom around to keep file organized + and keep byte-compiler quiet. + (nnir-read-parms): Accept search-engine as arg. + (nnir-run-query): Pass search-engine as arg. + (nnir-search-engine): Remove. 2010-10-30 Lars Magne Ingebrigtsen @@ -499,27 +499,27 @@ 2010-10-30 Andrew Cohen - * nnir.el: general clean up. allow searching with multiple - engines. allow separate extra-parameters for each engine. batch queries - when possible. - (nnir-imap-default-search-key,nnir-method-default-engines): add - customize interface. - (nnir-run-gmane): new engine. - (nnir-engines): use it. qualify all prompts with engine name. - (nnir-search-engine): remove global variable. - (nnir-run-hyrex): restore for now. - (nnir-extra-parms,nnir-search-history): new variables. - (gnus-group-make-nnir-group): use them. - (nnir-group-server): remove in favor of gnus-group-server. - (nnir-request-group): avoid searching twice. - (nnir-sort-groups-by-server): new function. + * nnir.el: General clean up. Allow searching with multiple engines. + Allow separate extra-parameters for each engine. + Batch queries when possible. + (nnir-imap-default-search-key,nnir-method-default-engines): + Add customize interface. + (nnir-run-gmane): New engine. + (nnir-engines): Use it. Qualify all prompts with engine name. + (nnir-search-engine): Remove global variable. + (nnir-run-hyrex): Restore for now. + (nnir-extra-parms,nnir-search-history): New variables. + (gnus-group-make-nnir-group): Use them. + (nnir-group-server): Remove in favor of gnus-group-server. + (nnir-request-group): Avoid searching twice. + (nnir-sort-groups-by-server): New function. 2010-10-30 Julien Danjou * gnus-group.el: Remove gnus-group-fetch-control. - * gnus-start.el (gnus-find-new-newsgroups): Remove - gnus-check-first-time-used. + * gnus-start.el (gnus-find-new-newsgroups): + Remove gnus-check-first-time-used. * gnus.el: Remove gnus-backup-default-subscribed-newsgroups. @@ -671,17 +671,17 @@ 2010-10-22 Andrew Cohen - * nnir.el (nnir-method-default-engines): new variable. - (nnir-run-query): use it. - (nnir-group-mode-hook): remove key binding and move to gnus-group.el. - (gnus-summary-nnir-goto-thread): change group if needed. + * nnir.el (nnir-method-default-engines): New variable. + (nnir-run-query): Use it. + (nnir-group-mode-hook): Remove key binding and move to gnus-group.el. + (gnus-summary-nnir-goto-thread): Change group if needed. - * gnus-group.el (gnus-group-group-map): add key binding for + * gnus-group.el (gnus-group-group-map): Add key binding for gnus-group-make-nnir-group. 2010-10-24 Lars Magne Ingebrigtsen - * shr.el (shr-tag-object): Added. + * shr.el (shr-tag-object): Add. * gnus-sum.el (gnus-summary-select-article): Make sure we have the original article buffer live. @@ -878,7 +878,7 @@ 2010-10-16 Andrew Cohen - * gnus-sum.el (gnus-summary-refer-thread): Bug fix. Add the thread + * gnus-sum.el (gnus-summary-refer-thread): Bug fix. Add the thread headers to gnus-newsgroup-headers. 2010-10-16 Lars Magne Ingebrigtsen @@ -1103,8 +1103,8 @@ 2010-10-10 Andrew Cohen * nnir.el (autoload): Clean up autoloads. - (nnir-imap-default-search-key): Renamed from - nnir-imap-search-field. Use key rather than value. + (nnir-imap-default-search-key): Rename from nnir-imap-search-field. + Use key rather than value. (nnir-imap-search-other): New variable. (nnir-read-parm): Use it. (nnir-imap-expr-to-imap): Use %S rather than imap-quote-specials. @@ -1771,8 +1771,8 @@ * gnus.el (gnus-local-domain): Declare variable obsolete. - * gnus-util.el (gnus-icompleting-read): Require iswitchb. Fix history - computing. + * gnus-util.el (gnus-icompleting-read): Require iswitchb. + Fix history computing. (gnus-ido-completing-read): Require ido. 2010-09-29 Lars Magne Ingebrigtsen @@ -2223,8 +2223,7 @@ 2010-09-25 Andrew Cohen (tiny change) - * nnir.el (nnir-run-imap): Allow sending IMAP search patterns - directly. + * nnir.el (nnir-run-imap): Allow sending IMAP search patterns directly. 2010-09-25 Lars Magne Ingebrigtsen @@ -2510,7 +2509,7 @@ 2010-09-22 Julien Danjou - * gnus-html.el (gnus-html-put-image): Stop using markers. They are + * gnus-html.el (gnus-html-put-image): Stop using markers. They are harmful if you have 2 images side-by-side, they can't be properly update on text deletion. Using text-property is safer here. (gnus-html-image-fetched): Search also for \r\n\r\n to get the start of @@ -2636,7 +2635,7 @@ cache. (gnus-html-put-image): Change buffer argument to use image data rather than file, and place image above region rather than inserting a new - one. Do not take alt-text as argument, since it's useless now: we place + one. Do not take alt-text as argument, since it's useless now: we place the image above alt-text. (gnus-html-prune-cache): Remove. (gnus-html-show-images): Start to fetch image when we find one, do not === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2010-11-12 22:34:06 +0000 +++ lisp/org/ChangeLog 2010-11-20 22:25:56 +0000 @@ -1148,11 +1148,6 @@ * ob-exp.el (org-babel-exp-src-blocks): Fixed export when headings have links, with tests. -2010-11-11 Sebastian Rose, Hannover, Germany - - * org-test-which-func: New function. Find name of defun around - point. - 2010-11-11 Carsten Dominik * org-latex.el (org-latex-to-pdf-process): Use texi2dvi if @@ -3134,11 +3129,11 @@ 2010-11-11 Dan Davison - * ob-octave.el only (require 'matlab) when necessary + * ob-octave.el: Only (require 'matlab) when necessary. (org-babel-octave-initiate-session) (require) octave-inf or matlab - as appropriate - (org-babel-execute:matlab): Remove (require) - (org-babel-prep-session:matlab): Remove (require) + as appropriate. + (org-babel-execute:matlab): Remove (require). + (org-babel-prep-session:matlab): Remove (require). (org-babel-matlab-initiate-session): Remove (require). 2010-11-11 Dan Davison @@ -3702,11 +3697,6 @@ 2010-07-19 Eric Schulte - * Makefile (lisp/org-install.el): Replace babel files in - construction of org-install.el. - -2010-07-19 Eric Schulte - * org-table.el (orgtbl-to-generic): Add the :remove-newlines option which will strip newline characters from the text of table cells and replace then with "\n". @@ -3853,10 +3843,6 @@ * org-html.el (org-export-html-close-lists-maybe): Check if raw HTML stuff was actually made from an example. -2010-07-19 Eric Schulte - - * Makefile (LISPF): Let's not compile files that won't often be used. - 2010-07-19 Bastien Guerry * org-latex.el: Items are no longer skipped when their first line === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2010-11-16 13:46:12 +0000 +++ lisp/url/ChangeLog 2010-11-20 22:25:56 +0000 @@ -91,7 +91,8 @@ 2010-09-14 Julien Danjou - * url-cache (url-store-in-cache): Make `buff' argument really optional. + * url-cache.el (url-store-in-cache): + Make `buff' argument really optional. 2010-09-14 Glenn Morris @@ -108,12 +109,12 @@ 2010-07-27 Michael Albinus - * url-http (url-http-parse-headers): Disable file name handlers at + * url-http.el (url-http-parse-headers): Disable file name handlers at all (not only Tramp). (Bug#6717) 2010-07-27 Michael Albinus - * url-http (url-http-parse-headers): Disable Tramp. (Bug#6717) + * url-http.el (url-http-parse-headers): Disable Tramp. (Bug#6717) 2010-07-01 Mark A. Hershberger ------------------------------------------------------------ revno: 102453 committer: Tassilo Horn branch nick: trunk timestamp: Sat 2010-11-20 18:32:57 +0100 message: * mail/emacsbug.el (report-emacs-bug-query-existing-bugs) (report-emacs-bug-parse-query-results) (report-emacs-bug-create-existing-bugs-buffer): Pass through keywords used for querying the bug database to show them in the existing bugs buffer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-20 14:51:25 +0000 +++ lisp/ChangeLog 2010-11-20 17:32:57 +0000 @@ -1,3 +1,11 @@ +2010-11-20 Tassilo Horn + + * mail/emacsbug.el (report-emacs-bug-query-existing-bugs) + (report-emacs-bug-parse-query-results) + (report-emacs-bug-create-existing-bugs-buffer): Pass through + keywords used for querying the bug database to show them in the + existing bugs buffer. + 2010-11-20 Jan Djärv * tool-bar.el (tool-bar-setup): Add some :vert-only keywords. === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2010-11-20 11:39:44 +0000 +++ lisp/mail/emacsbug.el 2010-11-20 17:32:57 +0000 @@ -380,7 +380,7 @@ ;; Querying the bug database -(defun report-emacs-bug-create-existing-bugs-buffer (bugs) +(defun report-emacs-bug-create-existing-bugs-buffer (bugs keywords) (switch-to-buffer (get-buffer-create "*Existing Emacs Bugs*")) (setq buffer-read-only t) (let ((inhibit-read-only t)) @@ -388,7 +388,9 @@ (make-local-variable 'bug-alist) (setq bug-alist bugs) (make-local-variable 'bug-choice-widget) - (widget-insert (propertize "Already known bugs:\n\n" 'face 'bold)) + (widget-insert (propertize (concat "Already known bugs (" + keywords "):\n\n") + 'face 'bold)) (if bugs (setq bug-choice-widget (apply 'widget-create 'radio-button-choice @@ -430,7 +432,7 @@ (widget-setup) (goto-char (point-min))) -(defun report-emacs-bug-parse-query-results (status) +(defun report-emacs-bug-parse-query-results (status keywords) (goto-char (point-min)) (let (buglist) (while (re-search-forward "\\([^<]+\\)" nil t) @@ -444,7 +446,7 @@ ;; then the subject and number subject (string-to-number number)) buglist)))) - (report-emacs-bug-create-existing-bugs-buffer (nreverse buglist)))) + (report-emacs-bug-create-existing-bugs-buffer (nreverse buglist) keywords))) (defun report-emacs-bug-query-existing-bugs (keywords) "Query for KEYWORDS at `report-emacs-bug-tracker-url', and return the result. @@ -454,7 +456,7 @@ "pkgreport.cgi?include=subject%3A" (replace-regexp-in-string "[[:space:]]+" "+" keywords) ";package=emacs") - 'report-emacs-bug-parse-query-results)) + 'report-emacs-bug-parse-query-results (list keywords))) (provide 'emacsbug) ------------------------------------------------------------ revno: 102452 committer: Ken Brown branch nick: trunk timestamp: Sat 2010-11-20 10:23:49 -0500 message: * src/sheap.c (STATIC_HEAP_SIZE): Increase to 13MB. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-20 15:04:50 +0000 +++ src/ChangeLog 2010-11-20 15:23:49 +0000 @@ -1,3 +1,7 @@ +2010-11-20 Ken Brown + + * sheap.c (STATIC_HEAP_SIZE): Increase to 13MB. + 2010-11-20 Eli Zaretskii * term.c (produce_glyphless_glyph): Use \uNNNN, \UNNNNNN, or === modified file 'src/sheap.c' --- src/sheap.c 2010-01-13 08:35:10 +0000 +++ src/sheap.c 2010-11-20 15:23:49 +0000 @@ -25,7 +25,7 @@ #include -#define STATIC_HEAP_SIZE (12 * 1024 * 1024) +#define STATIC_HEAP_SIZE (13 * 1024 * 1024) int debug_sheap = 0; ------------------------------------------------------------ revno: 102451 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-11-20 17:04:50 +0200 message: Use \uNNNN, \UNNNNNN, or \xNNNNNN for hex-code display on a TTY. term.c (produce_glyphless_glyph): Use \uNNNN, \UNNNNNN, or \xNNNNNN for hex-code display of glyphless characters. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-20 14:51:25 +0000 +++ src/ChangeLog 2010-11-20 15:04:50 +0000 @@ -1,3 +1,8 @@ +2010-11-20 Eli Zaretskii + + * term.c (produce_glyphless_glyph): Use \uNNNN, \UNNNNNN, or + \xNNNNNN for hex-code display of glyphless characters. + 2010-11-20 Jan Djärv * gtkutil.c (xg_make_tool_item): Take vert_only as argument. === modified file 'src/term.c' --- src/term.c 2010-11-15 06:10:35 +0000 +++ src/term.c 2010-11-20 15:04:50 +0000 @@ -1936,7 +1936,7 @@ { int face_id; int len; - char buf[11], *str = " "; + char buf[9], *str = " "; /* Get a face ID for the glyph by utilizing a cache (the same way as done for `escape-glyph' in get_next_display_element). */ @@ -1987,10 +1987,9 @@ else { xassert (it->glyphless_method == GLYPHLESS_DISPLAY_HEX_CODE); - len = (it->c < 0x100 ? sprintf (buf, "[U+%02X]", it->c) - : it->c < 0x10000 ? sprintf (buf, "[U+%04X]", it->c) - : it->c <= MAX_UNICODE_CHAR ? sprintf (buf, "[U+%06X]", it->c) - : sprintf (buf, "[E+%06X]", it->c)); + len = (it->c < 0x10000 ? sprintf (buf, "\\u%04X", it->c) + : it->c <= MAX_UNICODE_CHAR ? sprintf (buf, "\\U%06X", it->c) + : sprintf (buf, "\\x%06X", it->c)); } str = buf; } ------------------------------------------------------------ revno: 102450 committer: Jan D. branch nick: trunk timestamp: Sat 2010-11-20 15:51:25 +0100 message: Add keyword :vert-only for tool bar items with labels not shown horizontally. * lisp/info.el (info-tool-bar-map): Add some :vert-only keywords. * lisp/tool-bar.el (tool-bar-setup): Add some :vert-only keywords. * src/dispextern.h (tool_bar_item_idx): Add TOOL_BAR_ITEM_VERT_ONLY. * src/gtkutil.c (xg_make_tool_item): Take vert_only as argument. Set important to ! vert_only. (xg_show_toolbar_item): Don't show label horizontally if tool item isn't important. (update_frame_tool_bar): Get TOOL_BAR_ITEM_VERT_ONLY and pass it to xg_make_tool_item, or update important on existing tool item. * src/keyboard.c (QCvert_only): New variable. (parse_tool_bar_item): Check for QCvert_only. (syms_of_keyboard): Initialize QCvert_only. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-20 14:35:45 +0000 +++ lisp/ChangeLog 2010-11-20 14:51:25 +0000 @@ -1,3 +1,9 @@ +2010-11-20 Jan Djärv + + * tool-bar.el (tool-bar-setup): Add some :vert-only keywords. + + * info.el (info-tool-bar-map): Add some :vert-only keywords. + 2010-11-20 Eli Zaretskii * international/characters.el (glyphless-char-display-control): === modified file 'lisp/info.el' --- lisp/info.el 2010-11-09 05:33:07 +0000 +++ lisp/info.el 2010-11-20 14:51:25 +0000 @@ -3763,15 +3763,18 @@ (let ((map (make-sparse-keymap))) (tool-bar-local-item-from-menu 'Info-history-back "left-arrow" map Info-mode-map :rtl "right-arrow" - :label "Back") + :label "Back" + :vert-only t) (tool-bar-local-item-from-menu 'Info-history-forward "right-arrow" map Info-mode-map :rtl "left-arrow" - :label "Forward") + :label "Forward" + :vert-only t) (tool-bar-local-item-from-menu 'Info-prev "prev-node" map Info-mode-map :rtl "next-node") (tool-bar-local-item-from-menu 'Info-next "next-node" map Info-mode-map :rtl "prev-node") - (tool-bar-local-item-from-menu 'Info-up "up-node" map Info-mode-map) + (tool-bar-local-item-from-menu 'Info-up "up-node" map Info-mode-map + :vert-only t) (tool-bar-local-item-from-menu 'Info-top-node "home" map Info-mode-map) (tool-bar-local-item-from-menu 'Info-goto-node "jump-to" map Info-mode-map) (tool-bar-local-item-from-menu 'Info-index "index" map Info-mode-map === modified file 'lisp/tool-bar.el' --- lisp/tool-bar.el 2010-10-29 03:29:29 +0000 +++ lisp/tool-bar.el 2010-11-20 14:51:25 +0000 @@ -260,31 +260,33 @@ ;; People say it's bad to have EXIT on the tool bar, since users ;; might inadvertently click that button. ;;(tool-bar-add-item-from-menu 'save-buffers-kill-emacs "exit") - (tool-bar-add-item-from-menu 'find-file "new" nil :label "New File") - (tool-bar-add-item-from-menu 'menu-find-file-existing "open") - (tool-bar-add-item-from-menu 'dired "diropen") - (tool-bar-add-item-from-menu 'kill-this-buffer "close") - (tool-bar-add-item-from-menu 'save-buffer "save" nil - :visible '(or buffer-file-name - (not (eq 'special - (get major-mode - 'mode-class))))) - (tool-bar-add-item-from-menu 'write-file "saveas" nil - :visible '(or buffer-file-name - (not (eq 'special - (get major-mode - 'mode-class))))) - (tool-bar-add-item-from-menu 'undo "undo" nil + (tool-bar-add-item-from-menu 'find-file "new" nil :label "New File" + :vert-only t) + (tool-bar-add-item-from-menu 'menu-find-file-existing "open" nil + :vert-only t) + (tool-bar-add-item-from-menu 'dired "diropen" nil :vert-only t) + (tool-bar-add-item-from-menu 'kill-this-buffer "close" nil :vert-only t) + (tool-bar-add-item-from-menu 'save-buffer "save" nil :vert-only t + :visible '(or buffer-file-name + (not (eq 'special + (get major-mode + 'mode-class))))) + (tool-bar-add-item-from-menu 'write-file "saveas" nil :vert-only t + :visible '(or buffer-file-name + (not (eq 'special + (get major-mode + 'mode-class))))) + (tool-bar-add-item-from-menu 'undo "undo" nil :vert-only t :visible '(not (eq 'special (get major-mode 'mode-class)))) (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [cut]) - "cut" nil + "cut" nil :vert-only t :visible '(not (eq 'special (get major-mode 'mode-class)))) (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [copy]) - "copy") + "copy" nil :vert-only t) (tool-bar-add-item-from-menu (lookup-key menu-bar-edit-menu [paste]) - "paste" nil + "paste" nil :vert-only t :visible '(not (eq 'special (get major-mode 'mode-class)))) (tool-bar-add-item-from-menu 'nonincremental-search-forward "search" === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-20 11:45:14 +0000 +++ src/ChangeLog 2010-11-20 14:51:25 +0000 @@ -1,3 +1,18 @@ +2010-11-20 Jan Djärv + + * gtkutil.c (xg_make_tool_item): Take vert_only as argument. + Set important to ! vert_only. + (xg_show_toolbar_item): Don't show label horizontally if + tool item isn't important. + (update_frame_tool_bar): Get TOOL_BAR_ITEM_VERT_ONLY and pass it to + xg_make_tool_item, or update important on existing tool item. + + * keyboard.c (QCvert_only): New variable. + (parse_tool_bar_item): Check for QCvert_only. + (syms_of_keyboard): Initialize QCvert_only. + + * dispextern.h (tool_bar_item_idx): Add TOOL_BAR_ITEM_VERT_ONLY. + 2010-11-20 Eli Zaretskii * msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the === modified file 'src/dispextern.h' --- src/dispextern.h 2010-11-20 10:07:00 +0000 +++ src/dispextern.h 2010-11-20 14:51:25 +0000 @@ -2887,6 +2887,9 @@ /* Label to show when text labels are enabled. */ TOOL_BAR_ITEM_LABEL, + /* If we shall show the label only below the icon and not beside it. */ + TOOL_BAR_ITEM_VERT_ONLY, + /* Sentinel = number of slots in tool_bar_items occupied by one tool-bar item. */ TOOL_BAR_ITEM_NSLOTS === modified file 'src/gtkutil.c' --- src/gtkutil.c 2010-10-26 06:09:54 +0000 +++ src/gtkutil.c 2010-11-20 14:51:25 +0000 @@ -4059,7 +4059,8 @@ GtkWidget *wimage, GtkWidget **wbutton, const char *label, - int i) + int i, + int vert_only) { GtkToolItem *ti = gtk_tool_item_new (); Lisp_Object style = Ftool_bar_get_system_style (); @@ -4071,6 +4072,10 @@ GtkWidget *wb = gtk_button_new (); GtkWidget *weventbox = gtk_event_box_new (); + /* We are not letting Gtk+ alter display on this, we only keep it here + so we can get it later in xg_show_toolbar_item. */ + gtk_tool_item_set_is_important (ti, !vert_only); + if (wimage && ! text_image) gtk_box_pack_start (GTK_BOX (vb), wimage, TRUE, TRUE, 0); @@ -4144,7 +4149,8 @@ int text_image = EQ (style, Qtext_image_horiz); int horiz = both_horiz || text_image; - int show_label = ! EQ (style, Qimage); + int vert_only = ! gtk_tool_item_get_is_important (ti); + int show_label = ! EQ (style, Qimage) && ! (vert_only && horiz); int show_image = ! EQ (style, Qtext); GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (ti)); @@ -4301,7 +4307,8 @@ Lisp_Object specified_file; const char *label = (STRINGP (PROP (TOOL_BAR_ITEM_LABEL)) ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL)) : ""); - + int vert_only = ! NILP (PROP (TOOL_BAR_ITEM_VERT_ONLY)); + ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i); if (ti) @@ -4391,7 +4398,7 @@ else { /* Insert an empty (non-image) button */ - ti = xg_make_tool_item (f, NULL, NULL, "", i); + ti = xg_make_tool_item (f, NULL, NULL, "", i, 0); gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1); } continue; @@ -4425,7 +4432,7 @@ } gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin); - ti = xg_make_tool_item (f, w, &wbutton, label, i); + ti = xg_make_tool_item (f, w, &wbutton, label, i, vert_only); gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1); gtk_widget_set_sensitive (wbutton, enabled_p); } @@ -4442,6 +4449,7 @@ gpointer old_icon_name = g_object_get_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME); gtk_label_set_text (GTK_LABEL (wlbl), label); + gtk_tool_item_set_is_important (ti, !vert_only); if (stock_name && (! old_stock_name || strcmp (old_stock_name, stock_name) != 0)) { === modified file 'src/keyboard.c' --- src/keyboard.c 2010-11-18 16:57:00 +0000 +++ src/keyboard.c 2010-11-20 14:51:25 +0000 @@ -489,10 +489,10 @@ Lisp_Object Qevent_kind; Lisp_Object Qevent_symbol_elements; -/* menu item parts */ +/* menu and tool bar item parts */ Lisp_Object Qmenu_enable; Lisp_Object QCenable, QCvisible, QChelp, QCfilter, QCkeys, QCkey_sequence; -Lisp_Object QCbutton, QCtoggle, QCradio, QClabel; +Lisp_Object QCbutton, QCtoggle, QCradio, QClabel, QCvert_only; /* An event header symbol HEAD may have a property named Qevent_symbol_element_mask, which is of the form (BASE MODIFIERS); @@ -8269,9 +8269,12 @@ if (NILP (menu_item_eval_property (value))) return 0; } - else if (EQ (key, QChelp)) + else if (EQ (key, QChelp)) /* `:help HELP-STRING'. */ PROP (TOOL_BAR_ITEM_HELP) = value; + else if (EQ (key, QCvert_only)) + /* `:vert-only t/nil'. */ + PROP (TOOL_BAR_ITEM_VERT_ONLY) = value; else if (EQ (key, QClabel)) { const char *bad_label = "!!?GARBLED ITEM?!!"; @@ -11629,6 +11632,8 @@ staticpro (&QCradio); QClabel = intern_c_string (":label"); staticpro (&QClabel); + QCvert_only = intern_c_string (":vert-only"); + staticpro (&QCvert_only); Qmode_line = intern_c_string ("mode-line"); staticpro (&Qmode_line); ------------------------------------------------------------ revno: 102449 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-11-20 16:35:45 +0200 message: Make glyphless-char-display-control a defcustom. international/characters.el (glyphless-char-display-control): Make it a defcustom, with update-glyphless-char-display as its :set attribute. (top level): Don't call update-glyphless-char-display. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-20 13:12:27 +0000 +++ lisp/ChangeLog 2010-11-20 14:35:45 +0000 @@ -1,3 +1,10 @@ +2010-11-20 Eli Zaretskii + + * international/characters.el (glyphless-char-display-control): + Make it a defcustom, with update-glyphless-char-display as its + :set attribute. + (top level): Don't call update-glyphless-char-display. + 2010-11-20 Michael Albinus Sync with Tramp 2.2.0. === modified file 'lisp/international/characters.el' --- lisp/international/characters.el 2010-11-13 13:29:31 +0000 +++ lisp/international/characters.el 2010-11-20 14:35:45 +0000 @@ -1293,45 +1293,12 @@ (aset char-acronym-table (+ #xE0021 i) (format " %c TAG" (+ 33 i)))) (aset char-acronym-table #xE007F "->|TAG") ; CANCEL TAG -;;; Control of displaying glyphless characters. -(defvar glyphless-char-display-control - '((format-control . thin-space) - (no-font . hex-code)) - "List of directives to control display of glyphless characters. - -Each element has the form (GROUP . METHOD), where GROUP is a -symbol specifying the character group, and METHOD is a symbol -specifying the method of displaying characters belonging to that -group. - -GROUP must be one of these symbols: - `c0-control': U+0000..U+001F. - `c1-control': U+0080..U+009F. - `format-control': Characters of Unicode General Category `Cf', - such as U+200C (ZWNJ), U+200E (LRM), but - excluding characters that have graphic images, - such as U+00AD (SHY). - `no-font': characters for which no suitable font is found. - For character terminals, characters that cannot - be encoded by `terminal-coding-system'. - -METHOD must be one of these symbols: - `zero-width': don't display. - `thin-space': display a thin (1-pixel width) space. On character - terminals, display as 1-character space. - `empty-box': display an empty box. - `acronym': display an acronym of the character in a box. The - acronym is taken from `char-acronym-table', which see. - `hex-code': display the hexadecimal character code in a box. - -Just setting this variable does not take effect. Call the -function `update-glyphless-char-display' (which see) after -setting this variable.") - -(defun update-glyphless-char-display () +(defun update-glyphless-char-display (&optional variable value) "Make the setting of `glyphless-char-display-control' take effect. This function updates the char-table `glyphless-char-display'." - (dolist (elt glyphless-char-display-control) + (when value + (set-default variable value)) + (dolist (elt value) (let ((target (car elt)) (method (cdr elt))) (or (memq method '(zero-width thin-space empty-box acronym hex-code)) @@ -1365,7 +1332,66 @@ (t (error "Invalid glyphless character group: %s" target)))))) -(update-glyphless-char-display) +;;; Control of displaying glyphless characters. +(defcustom glyphless-char-display-control + '((format-control . thin-space) + (no-font . hex-code)) + "List of directives to control display of glyphless characters. + +Each element has the form (GROUP . METHOD), where GROUP is a +symbol specifying the character group, and METHOD is a symbol +specifying the method of displaying characters belonging to that +group. + +GROUP must be one of these symbols: + `c0-control': U+0000..U+001F. + `c1-control': U+0080..U+009F. + `format-control': Characters of Unicode General Category `Cf', + such as U+200C (ZWNJ), U+200E (LRM), but + excluding characters that have graphic images, + such as U+00AD (SHY). + `no-font': characters for which no suitable font is found. + For character terminals, characters that cannot + be encoded by `terminal-coding-system'. + +METHOD must be one of these symbols: + `zero-width': don't display. + `thin-space': display a thin (1-pixel width) space. On character + terminals, display as 1-character space. + `empty-box': display an empty box. + `acronym': display an acronym of the character in a box. The + acronym is taken from `char-acronym-table', which see. + `hex-code': display the hexadecimal character code in a box." + + :type '(alist :key-type (symbol :tag "Character Group") + :value-type (symbol :tag "Display Method")) + :options '((c0-control + (choice (const :tag "Don't display" zero-width) + (const :tag "Display as thin space" thin-space) + (const :tag "Display as empty box" empty-box) + (const :tag "Display acronym" acronym) + (const :tag "Display hex code in a box" hex-code))) + (c1-control + (choice (const :tag "Don't display" zero-width) + (const :tag "Display as thin space" thin-space) + (const :tag "Display as empty box" empty-box) + (const :tag "Display acronym" acronym) + (const :tag "Display hex code in a box" hex-code))) + (format-control + (choice (const :tag "Don't display" zero-width) + (const :tag "Display as thin space" thin-space) + (const :tag "Display as empty box" empty-box) + (const :tag "Display acronym" acronym) + (const :tag "Display hex code in a box" hex-code))) + (no-font + (choice (const :tag "Don't display" zero-width) + (const :tag "Display as thin space" thin-space) + (const :tag "Display as empty box" empty-box) + (const :tag "Display acronym" acronym) + (const :tag "Display hex code in a box" hex-code)))) + :set 'update-glyphless-char-display + :group 'display) + ;;; Setting word boundary. ------------------------------------------------------------ revno: 102448 committer: Michael Albinus branch nick: trunk timestamp: Sat 2010-11-20 14:17:25 +0100 message: Sync with Tramp 2.2.0. * trampver.texi: Update release number. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-11-19 01:14:36 +0000 +++ doc/misc/ChangeLog 2010-11-20 13:17:25 +0000 @@ -1,3 +1,9 @@ +2010-11-20 Michael Albinus + + Sync with Tramp 2.2.0. + + * trampver.texi: Update release number. + 2010-11-19 Jay Belanger * calc.texi (TeX and LaTeX Language Modes, Predefined Units): === modified file 'doc/misc/trampver.texi' --- doc/misc/trampver.texi 2010-11-09 20:07:10 +0000 +++ doc/misc/trampver.texi 2010-11-20 13:17:25 +0000 @@ -9,7 +9,7 @@ @c In the Tramp CVS, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.2.0-pre +@set trampver 2.2.0 @c Other flags from configuration @set instprefix /usr/local @@ -73,7 +73,3 @@ @set emacsotherdir emacs @set emacsotherfilename tramp-emacs.html @end ifset - -@ignore - arch-tag: e0fe322c-e06b-46eb-bb5b-d091b521f41c -@end ignore ------------------------------------------------------------ revno: 102447 committer: Michael Albinus branch nick: trunk timestamp: Sat 2010-11-20 14:12:27 +0100 message: Sync with Tramp 2.2.0. * net/tramp.el (tramp-handle-insert-file-contents): Don't use `file-remote-p' (due to compatibility). * net/tramp-sh.el (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band): Use `ignore-errors'. * net/trampver.el: Update release number. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-20 11:52:09 +0000 +++ lisp/ChangeLog 2010-11-20 13:12:27 +0000 @@ -1,3 +1,15 @@ +2010-11-20 Michael Albinus + + Sync with Tramp 2.2.0. + + * net/tramp.el (tramp-handle-insert-file-contents): Don't use + `file-remote-p' (due to compatibility). + + * net/tramp-sh.el (tramp-do-copy-or-rename-file-directly) + (tramp-do-copy-or-rename-file-out-of-band): Use `ignore-errors'. + + * net/trampver.el: Update release number. + 2010-11-20 Eli Zaretskii * faces.el (glyphless-char): Define value for `pc'. === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2010-11-13 10:42:32 +0000 +++ lisp/net/tramp-sh.el 2010-11-20 13:12:27 +0000 @@ -106,7 +106,8 @@ ;;;###tramp-autoload (add-to-list 'tramp-methods - '("scp" (tramp-login-program "ssh") + '("scp" + (tramp-login-program "ssh") (tramp-login-args (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h"))) (tramp-async-args (("-q"))) (tramp-remote-sh "/bin/sh") @@ -2166,16 +2167,13 @@ (list tmpfile localname2 ok-if-already-exists))))) ;; Save exit. - (condition-case nil - (delete-file tmpfile) - (error))))))))) + (ignore-errors (delete-file tmpfile))))))))) ;; Set the time and mode. Mask possible errors. - (condition-case nil + (ignore-errors (when keep-date (set-file-times newname file-times) - (set-file-modes newname file-modes)) - (error))))) + (set-file-modes newname file-modes)))))) (defun tramp-do-copy-or-rename-file-out-of-band (op filename newname keep-date) "Invoke rcp program to copy. @@ -2203,12 +2201,11 @@ (tramp-do-copy-or-rename-file-out-of-band 'rename tmpfile newname keep-date)) ;; Save exit. - (condition-case nil - (if dir-flag - (tramp-compat-delete-directory - (expand-file-name ".." tmpfile) 'recursive) - (delete-file tmpfile)) - (error)))) + (ignore-errors + (if dir-flag + (tramp-compat-delete-directory + (expand-file-name ".." tmpfile) 'recursive) + (delete-file tmpfile))))) ;; Expand hops. Might be necessary for gateway methods. (setq v (car (tramp-compute-multi-hops v))) @@ -5039,6 +5036,5 @@ ;; rsync. ;; * Try telnet+curl as new method. It might be useful for busybox, ;; without built-in uuencode/uudecode. -;; * Try ssh+netcat as out-of-band method. ;;; tramp-sh.el ends here === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2010-11-18 03:54:14 +0000 +++ lisp/net/tramp.el 2010-11-20 13:12:27 +0000 @@ -2863,7 +2863,9 @@ (set-visited-file-modtime) (set-buffer-modified-p nil) ;; For root, preserve owner and group when editing files. - (when (string-equal (file-remote-p filename 'user) "root") + (when (string-equal + (tramp-file-name-handler 'file-remote-p filename 'user) + "root") (set (make-local-variable 'backup-by-copying-when-mismatch) t))) (when (and (stringp local-copy) (or remote-copy (null tramp-temp-buffer-file-name))) === modified file 'lisp/net/trampver.el' --- lisp/net/trampver.el 2010-11-09 20:07:10 +0000 +++ lisp/net/trampver.el 2010-11-20 13:12:27 +0000 @@ -32,7 +32,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.0-pre" +(defconst tramp-version "2.2.0" "This version of Tramp.") ;;;###tramp-autoload @@ -45,7 +45,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.0-pre is not fit for %s" + (format "Tramp 2.2.0 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) @@ -56,7 +56,6 @@ (provide 'trampver) -;; arch-tag: 443576ca-f8f1-4bb1-addc-5c70861e93b1 ;;; trampver.el ends here ;; Local Variables: ------------------------------------------------------------ revno: 102446 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-11-20 13:52:09 +0200 message: lisp/ChangeLog: Fix entry for bug-querying changes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-20 11:47:49 +0000 +++ lisp/ChangeLog 2010-11-20 11:52:09 +0000 @@ -4,11 +4,11 @@ 2010-11-20 Tassilo Horn - * mail/emacsbug.el (report-emacs-bug-tracker-url) + Implemented a bug querying mechanism. + * mail/emacsbug.el (report-emacs-bug-tracker-url): New variable. (report-emacs-bug-create-existing-bugs-buffer) (report-emacs-bug-parse-query-results) - (report-emacs-bug-query-existing-bugs): Implemented a bug querying - mechanism. + (report-emacs-bug-query-existing-bugs): New functions. 2010-11-19 Tassilo Horn ------------------------------------------------------------ revno: 102445 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-11-20 13:47:49 +0200 message: faces.el (glyphless-char): Define value for `pc'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-20 11:39:44 +0000 +++ lisp/ChangeLog 2010-11-20 11:47:49 +0000 @@ -1,3 +1,7 @@ +2010-11-20 Eli Zaretskii + + * faces.el (glyphless-char): Define value for `pc'. + 2010-11-20 Tassilo Horn * mail/emacsbug.el (report-emacs-bug-tracker-url) === modified file 'lisp/faces.el' --- lisp/faces.el 2010-11-01 07:53:08 +0000 +++ lisp/faces.el 2010-11-20 11:43:01 +0000 @@ -2485,6 +2485,7 @@ (defface glyphless-char '((((type tty)) :inherit underline) + (((type pc)) :inherit escape-glyph) (t :height 0.6)) "Face for displaying non-graphic characters (e.g. U+202A (LRE)). It is used for characters of no fonts too." ------------------------------------------------------------ revno: 102444 [merge] committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2010-11-20 13:45:14 +0200 message: msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-20 10:07:00 +0000 +++ src/ChangeLog 2010-11-20 11:45:14 +0000 @@ -1,3 +1,8 @@ +2010-11-20 Eli Zaretskii + + * msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the + same in-line. + 2010-11-20 Andreas Schwab * xfaces.c (lookup_face): Make static. === modified file 'src/msdos.c' --- src/msdos.c 2010-11-17 02:37:45 +0000 +++ src/msdos.c 2010-11-20 11:45:14 +0000 @@ -2725,17 +2725,8 @@ /* If the contents of the global variable help_echo has changed, generate a HELP_EVENT. */ if (!NILP (help_echo_string) || !NILP (previous_help_echo_string)) - { - event.kind = HELP_EVENT; - event.frame_or_window = selected_frame; - event.arg = help_echo_object; - event.x = WINDOWP (help_echo_window) - ? help_echo_window : selected_frame; - event.y = help_echo_string; - event.timestamp = event_timestamp (); - event.code = help_echo_pos; - kbd_buffer_store_event (&event); - } + gen_help_event (help_echo_string, selected_frame, help_echo_window, + help_echo_object, help_echo_pos); } for (but = 0; but < NUM_MOUSE_BUTTONS; but++) ------------------------------------------------------------ revno: 102443 committer: Tassilo Horn branch nick: trunk timestamp: Sat 2010-11-20 12:39:44 +0100 message: * mail/emacsbug.el (report-emacs-bug-tracker-url) (report-emacs-bug-create-existing-bugs-buffer) (report-emacs-bug-parse-query-results) (report-emacs-bug-query-existing-bugs): Implemented a bug querying mechanism. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-19 11:18:15 +0000 +++ lisp/ChangeLog 2010-11-20 11:39:44 +0000 @@ -1,3 +1,11 @@ +2010-11-20 Tassilo Horn + + * mail/emacsbug.el (report-emacs-bug-tracker-url) + (report-emacs-bug-create-existing-bugs-buffer) + (report-emacs-bug-parse-query-results) + (report-emacs-bug-query-existing-bugs): Implemented a bug querying + mechanism. + 2010-11-19 Tassilo Horn * textmodes/reftex-ref.el (reftex-goto-label): If point is inside === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2010-10-14 14:32:27 +0000 +++ lisp/mail/emacsbug.el 2010-11-20 11:39:44 +0000 @@ -58,6 +58,9 @@ ;; User options end here. +(defvar report-emacs-bug-tracker-url "http://debbugs.gnu.org/cgi/" + "Base URL of the GNU bugtracker. +Used for querying duplicates and linking to existing bugs.") (defvar report-emacs-bug-orig-text nil "The automatically-created initial text of the bug report.") @@ -120,7 +123,6 @@ (concat "mailto:" to)) (error "Subject, To or body not found"))))) - ;;;###autoload (defun report-emacs-bug (topic &optional recent-keys) "Report a bug in GNU Emacs. @@ -375,6 +377,85 @@ 'field 'emacsbug-prompt)) (delete-region pos (field-end (1+ pos))))))) + +;; Querying the bug database + +(defun report-emacs-bug-create-existing-bugs-buffer (bugs) + (switch-to-buffer (get-buffer-create "*Existing Emacs Bugs*")) + (setq buffer-read-only t) + (let ((inhibit-read-only t)) + (erase-buffer) + (make-local-variable 'bug-alist) + (setq bug-alist bugs) + (make-local-variable 'bug-choice-widget) + (widget-insert (propertize "Already known bugs:\n\n" 'face 'bold)) + (if bugs + (setq bug-choice-widget + (apply 'widget-create 'radio-button-choice + :value (car (first bugs)) + (let (items) + (dolist (bug bugs) + (push (list + 'url-link + :format (concat "Bug#" (number-to-string (third bug)) + ": " (second bug) "\n %[%v%]\n") + ;; FIXME: Why is only the link of the + ;; active item clickable? + (first bug)) + items)) + (nreverse items)))) + (widget-insert "No bugs maching your keywords found.\n")) + (widget-insert "\n") + (widget-create 'push-button + :notify (lambda (&rest ignore) + ;; TODO: Do something! + (message "Reporting new bug!")) + "Report new bug") + (when bugs + (widget-insert " ") + (widget-create 'push-button + :notify (lambda (&rest ignore) + (let ((val (widget-value bug-choice-widget))) + ;; TODO: Do something! + (message "Appending to bug %s!" + (third (assoc val bug-alist))))) + "Append to chosen bug")) + (widget-insert " ") + (widget-create 'push-button + :notify (lambda (&rest ignore) + (kill-buffer)) + "Quit reporting bug") + (widget-insert "\n")) + (use-local-map widget-keymap) + (widget-setup) + (goto-char (point-min))) + +(defun report-emacs-bug-parse-query-results (status) + (goto-char (point-min)) + (let (buglist) + (while (re-search-forward "\\([^<]+\\)" nil t) + (let ((number (match-string 1)) + (subject (match-string 2))) + (when (not (string-match "^#" subject)) + (push (list + ;; first the bug URL + (concat report-emacs-bug-tracker-url + "bugreport.cgi?bug=" number) + ;; then the subject and number + subject (string-to-number number)) + buglist)))) + (report-emacs-bug-create-existing-bugs-buffer (nreverse buglist)))) + +(defun report-emacs-bug-query-existing-bugs (keywords) + "Query for KEYWORDS at `report-emacs-bug-tracker-url', and return the result. +The result is an alist with items of the form (URL SUBJECT NO)." + (interactive "sBug keywords: ") + (url-retrieve (concat report-emacs-bug-tracker-url + "pkgreport.cgi?include=subject%3A" + (replace-regexp-in-string "[[:space:]]+" "+" keywords) + ";package=emacs") + 'report-emacs-bug-parse-query-results)) + (provide 'emacsbug) ;;; emacsbug.el ends here ------------------------------------------------------------ revno: 102442 committer: Andreas Schwab branch nick: emacs timestamp: Sat 2010-11-20 11:07:00 +0100 message: * src/xfaces.c (lookup_face): Make static. * src/dispnew.c (copy_row_except_pointers): Likewise. * src/syntax.c (dec_bytepos): Likewise. (inc_bytepos): Remove. * src/dispextern.h (lookup_face): Remove declaration. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-19 16:34:22 +0000 +++ src/ChangeLog 2010-11-20 10:07:00 +0000 @@ -1,3 +1,11 @@ +2010-11-20 Andreas Schwab + + * xfaces.c (lookup_face): Make static. + * dispnew.c (copy_row_except_pointers): Likewise. + * syntax.c (dec_bytepos): Likewise. + (inc_bytepos): Remove. + * dispextern.h (lookup_face): Remove declaration. + 2010-11-19 Eli Zaretskii * xdisp.c (set_cursor_from_row): Display cursor after all the === modified file 'src/dispextern.h' --- src/dispextern.h 2010-11-13 13:29:31 +0000 +++ src/dispextern.h 2010-11-20 10:07:00 +0000 @@ -3175,7 +3175,6 @@ int ascii_face_of_lisp_face (struct frame *, int); void prepare_face_for_display (struct frame *, struct face *); int xstrcasecmp (const unsigned char *, const unsigned char *); -int lookup_face (struct frame *, Lisp_Object *); int lookup_named_face (struct frame *, Lisp_Object, int); int lookup_basic_face (struct frame *, int); int smaller_face (struct frame *, int, int); === modified file 'src/dispnew.c' --- src/dispnew.c 2010-11-17 02:37:45 +0000 +++ src/dispnew.c 2010-11-20 10:07:00 +0000 @@ -1180,7 +1180,7 @@ /* Copy glyph row structure FROM to glyph row structure TO, except that glyph pointers in the structures are left unchanged. */ -INLINE void +static INLINE void copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from) { struct glyph *pointers[1 + LAST_AREA]; === modified file 'src/syntax.c' --- src/syntax.c 2010-09-24 15:24:47 +0000 +++ src/syntax.c 2010-11-20 10:07:00 +0000 @@ -371,23 +371,10 @@ return quoted; } -/* Return the bytepos one character after BYTEPOS. - We assume that BYTEPOS is not at the end of the buffer. */ - -INLINE EMACS_INT -inc_bytepos (EMACS_INT bytepos) -{ - if (NILP (current_buffer->enable_multibyte_characters)) - return bytepos + 1; - - INC_POS (bytepos); - return bytepos; -} - /* Return the bytepos one character before BYTEPOS. We assume that BYTEPOS is not at the start of the buffer. */ -INLINE EMACS_INT +static INLINE EMACS_INT dec_bytepos (EMACS_INT bytepos) { if (NILP (current_buffer->enable_multibyte_characters)) === modified file 'src/xfaces.c' --- src/xfaces.c 2010-10-24 01:48:39 +0000 +++ src/xfaces.c 2010-11-20 10:07:00 +0000 @@ -4540,7 +4540,7 @@ Value is the ID of the face found. If no suitable face is found, realize a new one. */ -INLINE int +static INLINE int lookup_face (struct frame *f, Lisp_Object *attr) { struct face_cache *cache = FRAME_FACE_CACHE (f); ------------------------------------------------------------ revno: 102441 committer: Katsumi Yamaoka branch nick: trunk timestamp: Sat 2010-11-20 01:18:17 +0000 message: gnus-gravatar.el (gnus-gravatar-transform-address): Decode name again. (gnus-gravatar-insert): Put avatar always in the beginning of the field. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-19 04:55:16 +0000 +++ lisp/gnus/ChangeLog 2010-11-20 01:18:17 +0000 @@ -1,3 +1,8 @@ +2010-11-20 Katsumi Yamaoka + + * gnus-gravatar.el (gnus-gravatar-transform-address): Decode name again. + (gnus-gravatar-insert): Put avatar always in the beginning of the field. + 2010-11-19 Katsumi Yamaoka * gnus-art.el (gnus-mime-display-single) === modified file 'lisp/gnus/gnus-gravatar.el' --- lisp/gnus/gnus-gravatar.el 2010-11-07 01:10:01 +0000 +++ lisp/gnus/gnus-gravatar.el 2010-11-20 01:18:17 +0000 @@ -63,11 +63,13 @@ (gravatar-size gnus-gravatar-size) name) (dolist (address addresses) + (when (setq name (cdr address)) + (setcdr address (setq name (mail-decode-encoded-word-string name)))) (when (or force (not (and gnus-gravatar-too-ugly (or (string-match gnus-gravatar-too-ugly (car address)) - (and (setq name (cdr address)) + (and name (string-match gnus-gravatar-too-ugly name)))))) (ignore-errors @@ -87,12 +89,12 @@ (mail-header-narrow-to-field) (let ((real-name (cdr address)) (mail-address (car address))) - (when (if real-name ; have a realname, go for it! - (and (search-forward real-name nil t) - (search-backward real-name nil t)) - (and (search-forward mail-address nil t) - (search-backward mail-address nil t))) - (goto-char (1- (point))) + (when (if real-name + (re-search-forward (concat (regexp-quote real-name) "\\|" + (regexp-quote mail-address)) + nil t) + (search-forward mail-address nil t)) + (goto-char (1- (match-beginning 0))) ;; If we're on the " quoting the name, go backward (when (looking-at "[\"<]") (goto-char (1- (point)))) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.