Comment the ENABLE_CHECKING version of the CHECK macro.

(ps-xemacs-color-name, ps-xemacs-face-kind-p): Only
do work for XEmacs.
(ps-xemacs-mapper): Rename from ps-mapper, only work on XEmacs.
(ps-xemacs-extent-sorter): Rename from ps-extent-sorter, only work
on XEmacs.
(ps-x-color-instance-p, ps-x-color-instance-rgb-components)
(ps-x-color-name, ps-x-color-specifier-p)
(ps-x-copy-coding-system, ps-x-device-class)
(ps-x-extent-end-position, ps-x-extent-face)
(ps-x-extent-priority, ps-x-extent-start-position)
(ps-x-face-font-instance, ps-x-find-coding-system)
(ps-x-font-instance-properties, ps-x-make-color-instance)
(ps-x-map-extents, ps-e-face-bold-p, ps-e-face-italic-p)
(ps-e-next-overlay-change, ps-e-overlays-at, ps-e-overlay-get)
(ps-e-overlay-end, ps-e-x-color-values, ps-e-color-values):
(ps-generate-postscript-with-faces): Delete defaliases.
(ps-face-foreground-name, ps-face-background-name)
(ps-color-values, ps-face-bold-p, ps-face-italic-p): Move
definitions to top level, make the body conditional on the emacs
flavor. Replace uses of deleted aliases and renamed functions.
(ps-generate-postscript-with-faces, ps-color-device): Replace uses
of deleted aliases and renamed functions.

* calc/calc.el (calc-emacs-type-lucid): Remove.
(calc-digit-map, calcDigit-start, calc-read-key)
(calc-clear-unread-commands):
* calc/calc-ext.el (calc-user-key-map): Replace uses of
calc-emacs-type-lucid with (featurep 'xemacs)

* emulation/tpu-mapper.el: Replace tpu-lucid-emacs19-p with
(featurep 'xemacs).
(tpu-lucid-emacs19-p): Remove.
(tpu-map-key): Make it a function instead of using fset.  Inline
tpu-emacs-map-key and tpu-lucid-map-key.  Use featurep 'xemacs.
(tpu-emacs-map-key, tpu-lucid-map-key): Remove.

* ielm.el: Use featurep 'xemacs.

* progmodes/cperl-mode.el (cperl-xemacs-p): Remove.
(condition-case, cperl-can-font-lock, cperl-singly-quote-face)
(cperl-define-key, cperl-mode-map, cperl-mode, cperl-init-faces)
(cperl-write-tags, cperl-tags-hier-init, cperl-perldoc): Replace
cperl-xemacs-p with (featurep 'xemacs).
(font-lock-cache-position): Pacify byte compiler.

(browse-url-text-xterm): Renamed from browse-url-lynx-xterm and made generic.
(browse-url-text-emacs): Likewise.
(browse-url-text-browser): New variable.
(browse-url-text-emacs-args): Renamed from browse-url-lynx-emacs-args.
(browse-url-text-input-field, browse-url-text-input-attempts)
(browse-url-kde-program): Likewise.

(read-color): New function.
(face-at-point, foreground-color-at-point)
(background-color-at-point): New functions.

*** empty log message ***

*** empty log message ***

Add new directories etc/images/smilies/grayscale,medium.

*** empty log message ***

Restore Feb 2007 copyright clarifications lost in update to Gnus
trunk.

*** empty log message ***

(org-publish-get-plist-from-filename):
Use mapc rather than mapcar (reinstall change deleted without log
entry 2007-10-22).

*** empty log message ***

Revert down-casing of copyright header.

(wdired-next-line, wdired-previous-line): Use
next-line and previous-line wrapped in with-no-warnings.

Ryan Yeske  <rcyeske at gmail.com>

(rcirc-server-alist): Use coloned symbols for parameter names.
(rcirc-recent-quit-alist): New function.
(rcirc): Print a better message when there is only one connected server.
(rcirc-complete-nick): Do not update the nick table here.
(rcirc-mode-map): Add M-o.
(rcirc-current-line): Add variable.
(rcirc-mode): Setup variables for line based omit.
(rcirc-edit-multiline): Strip text properties.
(rcirc-omit-responses): Add NICK.
(rcirc-omit-threshold): Add variable.
(rcirc-last-quit-line, rcirc-last-line, rcirc-elapsed-lines): Add functions.
(rcirc-print): Keep track of current line.  Do not fill text if
`rcirc-fill-flag' is null.  Only omit text if the last activity
from the sender is more than `rcirc-omit-threshold' lines ago.
(rcirc-put-nick-channel, rcirc-handler-PRIVMSG): Track line
numbers instead of time.
(rcirc-channel-nicks): Sort by line numbers instead of time.
(rcirc-omit-mode): Add `...' when omitting text and recenter.
(rcirc-handler-JOIN): Restore the joiners linestamp.
(rcirc-maybe-remember-nick-quit): Add function.
(rcirc-handler-QUIT): Record sender in table of recently quit nicks.

Fix typo in lisp/erc/ChangeLog

Sync from upstream ERC

(server-unload-function): Rename from `server-unload-hook' and
adapt to new `unload-feature' functionality.  Remove hook from
`kill-buffer-hook' buffer-locally.
(server-unload-hook): Remove.
(server-unload-function): New var; replaces `server-unload-hook'.

(unload-feature-special-hooks): Add `delete-frame-functions'
and `suspend-tty-functions'.

Update commentary.
(dirtrack-debug): Doc fix.
(dirtrack-mode, dirtrack-debug-mode): New names for
dirtrack-toggle and dirtrack-debug-toggle.  Use define-minor-mode.
(dirtrack-toggle, dirtrack-debug-toggle, dirtrackp, dirtrack-debug):
Make obsolete.
(dirtrack-debug-message): Only print message if
dirtrack-debug-mode is non-nil.  Use with-current-buffer.
(dirtrack): Doc fix.  Use dirtrack-mode rather than dirtrackp.
Remove dirtrack-debug checks now that dirtrack-debug-message does this.

Update commentary.

Fix typo.

Move local variables to end of file, and set byte-compile-warnings to
`(not cl-functions)'.

Fix typo in previous change.

shell.el no longer defines the aliases...

The variable `byte-compile-warnings' can now...

(byte-compile-warnings): Document `not'.
(byte-compile-warnings-safe-p): Handle `not'.
(byte-compile-warning-enabled-p, byte-compile-disable-warning)
(byte-compile-enable-warning): New functions.
(byte-compile-eval-before-compile)
(byte-compile-file-form-require): Use byte-compile-disable-warning.
(byte-compile-close-variables): Locally bind byte-compile-warnings,
but do not modify it.
(byte-compile-eval, byte-compile-obsolete)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file-form-defvar)
(byte-compile-file-form-custom-declare-variable)
(byte-compile-file-form-require)
(byte-compile-file-form-defmumble, byte-compile-lambda)
(byte-compile-form, byte-compile-normal-call)
(byte-compile-variable-ref, byte-compile-defvar)
(byte-compile-make-variable-buffer-local):
Use byte-compile-warning-enabled-p.

(ad-compile-function): Use byte-compile-disable-warning.

Add a local variables section, and set
byte-compile-warnings to `(not cl-functions)'.

Unify local variable section, and set
byte-compile-warnings to `(not cl-functions)'.
(cl-do-proclaim): Use byte-compile-disable-warning and
byte-compile-enable-warning.

Unify local variable section, and set byte-compile-warnings to `(not
cl-functions)'.

(cc-bytecomp-ignore-obsolete): Use byte-compile-disable-warning.

* cus-edit.el (custom-browse-insert-prefix):
* emulation/edt.el (edt-x-emacs19-p): Use featurep 'xemacs.

(server-process-filter): Fix typo in docstring.
(server-log): Reflow docstrings.
(server-delete-client, server-kill-emacs-query-function): Doc fixes.
(server-goto-line-column): Use `when'.

(isearch-other-meta-char): Call `isearch-edit-string' when mouse is
clicked on the isearch message.
(isearch-resume): Call `isearch-update' at the end.  Rename argument
`search' to `string' to conform to the isearch terminology.

Fix comment.

Fix typos.

(OBJ1): Remove abbrev.$(O).
($(BLD)/abbrev.$(O)): Remove.

(obj): Remove abbrev.o.

* gnus.texi, gnus-faq.texi, message.texi: Bump version to Gnus v5.13.

* gnus.el: Bump version to Gnus v5.13.

Update Gnus to No Gnus 0.7 from the Gnus CVS trunk

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-911

Detect if text foreground and background are equals

Rewrite abbrev.c in Elisp.
* image.c (Qcount): Don't declare as extern.
(syms_of_image): Initialize and staticpro `Qcount'.
* puresize.h (BASE_PURESIZE): Increase for the new abbrev.el functions.
* emacs.c (main): Don't call syms_of_abbrev.
* Makefile.in (obj): Remove abbrev.o.
(abbrev.o): Remove.
* abbrev.c: Remove.

Rewrite abbrev.c in Elisp.
* abbrev.el (abbrev-mode): Move custom group from cus-edit.el.
(abbrev-table-get, abbrev-table-put, abbrev-get)
(abbrev-put, make-abbrev-table, abbrev-table-p, clear-abbrev-table)
(define-abbrev, abbrev--check-chars, define-global-abbrev)
(define-mode-abbrev, abbrev--active-tables, abbrev-symbol)
(abbrev-expansion, abbrev--before-point, expand-abbrev)
(unexpand-abbrev, abbrev--write, abbrev--describe)
(insert-abbrev-table-description, define-abbrev-table):
New funs, largely transcribed from abbrev.c.
(abbrev-with-wrapper-hook): New macro.
(abbrev-table-name-list, global-abbrev-table)
(abbrev-minor-mode-table-alist, fundamental-mode-abbrev-table)
(abbrevs-changed, abbrev-all-caps, abbrev-start-location)
(abbrev-start-location-buffer, last-abbrev, last-abbrev-text)
(last-abbrev-location, pre-abbrev-expand-hook, abbrev-expand-function):
New vars, largely transcribed from abbrev.c.
* cus-edit.el (abbrev-mode): Remove.  Move to abbrev.el.
* cus-start.el: Remove abbrev-all-caps and pre-abbrev-expand-hook.
* loadup.el: Load "abbrev.el" before "lisp-mode.el".

(shell-dirtrack-verbose, shell-directory-tracker): Doc fix.
(shell-dirtrack-toggle): Mark as obsolete.
(dirtrack-toggle, dirtrack-mode): No longer alias to shell-dirtrack-mode.

*** empty log message ***

*** empty log message ***

(Formulas, Composition Basics): Lower the precedence of negation.

Mention the lowering of the precedence of negation.

Reorder conditions to avoid warnings.

(math-oper-table): Lower precedence of negation for C, TeX, and eqn.

(math-standard-opers): Lower the precedence of negation.

(fortran-tab-mode-string): Revert change merged in from EMACS_22 branch.
This code behaves differently on the trunk.

(f90-font-lock-keywords-1): Revert change merged in from EMACS_22 branch.
The trunk version does this differently.

(desktop-load-locked-desktop, desktop-base-lock-name, desktop-not-loaded-hook):
Fix :version tags.

(legacy-style-world-list): Fix TZ values for London, Bangalore, and Tokyo.

*** empty log message ***

* net/tramp.el (tramp-wrong-passwd-regexp): Tune regexp.
(tramp-get-remote-tmpdir): New defun.
(tramp-make-tramp-temp-file): Use it.
(tramp-local-call-process): New defun.  Replace all calls of
`call-process' by this when appropriate.
(tramp-handle-write-region): Replace calls of `file-attributes' by
`tramp-compat-file-attributes'.
(tramp-find-shell, tramp-open-connection-setup-interactive-shell):
Make the first command a `tramp-send-command' call, with let-bind
of `tramp-end-of-output'.
(tramp-version, tramp-bug, tramp-reporter-dump-variable)
(tramp-load-report-modules, tramp-append-tramp-buffers): Move to
tramp-cmds.el.

* net/tramp-fish.el (tramp-fish-handle-copy-file)
(tramp-fish-do-copy-or-rename-file)
(tramp-fish-do-copy-or-rename-file-directly):
* net/tramp-smb.el (tramp-smb-handle-copy-file):
Add parameter PRESERVE-UID-GID.

Add *.pyc.

Comment change.

(zoneinfo-style-world-list, legacy-style-world-list): New defcustoms.
(display-time-world-list): Use them as appropriate for the current value
of `system-type'.

Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 131-137)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-908

Pacify byte compiler

* emulation/pc-select.el (next-line-mark, next-line-nomark)
(previous-line-mark, previous-line-nomark): Wrap with-no-warnings
around uses of previous-line and next-line.

* diff.el (diff-old-file, diff-new-file, diff-extra-args): New
defvars.

* textmodes/css-mode.el (comment-continue):
* net/browse-url.el (url-handler-regexp):
* progmodes/idlw-help.el (idlwave-system-routines): Pacify
byte-compiler.

(window_min_size_2): Don't count header-line.

(window_min_size_2): Don't count header-line.

(fill-nobreak-p): Replace obsolete alias
line-move-invisible-p with invisible-p, it was removed on
2007-08-29.

(struct frame): Move all bit fields after the first bit
field to take advantage of the available space. Group all the
chars together to reduce wasted space due to padding.

Add a wrapper for getenv so it also checks the registry on Windows.
Suggestion and algorithm by Eli Zaretskii.
Code partially based on w32_get_resource and init_environment (w32.c).
(egetenv): New wrapper for getenv.
(get_current_dir_name, decode_options, get_server_config, set_local_socket,
set_socket, main): Use egetenv, not getenv.
(w32_get_resource, w32_getenv) [WINDOWSNT]: New functions.

Add a wrapper for getenv so it also checks the registry on Windows.
Suggestion and algorithm by Eli Zaretskii.
Code partially based on w32_get_resource and init_environment (w32.c).
(xmalloc): New function by Károly Lőrentey (backported from the trunk).
(quote_file_name): Use it.
(egetenv): New wrapper for getenv.
(get_current_dir_name, decode_options, get_server_config, set_local_socket,
set_socket, main): Use egetenv, not getenv.
(w32_get_resource, w32_getenv) [WINDOWSNT]: New functions.

(kill-emacs-query-functions): Doc fix; `save-buffers-kill-emacs'
is no longer bound to a key.

(Fread_minibuffer, Feval_minibuffer): Reflow docstrings.

(spare_memory, stack_copy, stack_copy_size, ignore_warnings, Vdead,
dont_register_blocks, staticvec, staticidx, interval_block, n_interval_blocks,
init_strings, check_string_bytes, check_sblock, init_float, free_float,
n_cons_blocks, init_cons, all_vectors, n_vectors, symbol_block,
symbol_block_index, symbol_free_list, n_symbol_blocks, init_symbol,
marker_block, marker_free_list, n_marker_blocks, init_marker, valid_pointer_p,
make_pure_float, last_marked, mark_object_loop_halt): Make static.

*** empty log message ***

*** empty log message ***

*** empty log message ***

(isearch-buffers-multi): New option.
(isearch-buffers-search-fun): Test it.

(ps-mode-map): Delete C-c v binding.
Put ps-run-clear on C-c C-l.

(comment-styles): New style indent-or-triple.
(comment-style): Make that the default.
(comment-add defvar): Doc fix.
(comment-add): Delete arg EXTRA.
(comment-region-default): Open code call to comment-add.
Handle indent-or-triple style which uses `multi-char' for INDENT.

(Equality Predicates): Null strings are uniquified.

Minor clarifications in previous change.

*** empty log message ***

(nil-blank-string): Doc fix.

2007-10-26  John Wiegley  <johnw@newartisans.com>

* eshell/em-unix.el (eshell/diff): Before calling the `diff'
function, ensure that the third argument is turned into a NIL if
the string is otherwise completely empty (either no characters, or
all tabs/spaces).  This fixes a bug from a user who found himself
unable to customize `diff-switches' and still use Eshell's diff
command.

(byte-compile-warnings): Autoload the safe-local-variable property.

(byte-compile-warnings): Autoload the safe-local-variable property.

*** empty log message ***

(browse-url-browser-function): Delete grail.
(browse-url-grail): Function and variable deleted.
(browse-url-browser-function): Delete IXI Mosaic.
(browse-url-default-browser): Don't try IXI Mosaic.
(browse-url-iximosaic): Function deleted.
(browse-url-browser-function): Delete MMM.
(browse-url-default-browser): Don't try MMM.
(browse-url-mmm): Function deleted.

(custom-note-var-changed): New function.

(browse-url-browser-function): Delete grail.
(browse-url-grail): Function and variable deleted.
(browse-url-browser-function): Delete IXI Mosaic.
(browse-url-default-browser): Don't try IXI Mosaic.
(browse-url-iximosaic): Function deleted.
(browse-url-browser-function): Delete MMM.
(browse-url-default-browser): Don't try MMM.
(browse-url-mmm): Function deleted.

(syms_of_frame) <delete-frame-functions>: Fix typo in docstring.

(sock_err_message): New function.
(set_tcp_socket): Use it.

* emulation/edt-mapper.el (edt-emacs-variant): Replace the only
use with the definition. Remove.

* add-log.el (change-log-start-entry-re): New defconst.
(change-log-sortable-date-at): Use it.
(change-log-beginning-of-defun, change-log-end-of-defun): New
functions.
(change-log-mode): Use them for beginning-of-defun-function and
end-of-defun-function.

* erc-ibuffer.el (erc-modified-channels-alist): Pacify
byte-compiler.

*** empty log message ***

ses.texi (The Basics): Mention how to create a new spreadsheet. Mention the
new three-letter column identifiers.
(More on cell printing): Calculate-cell and truncate-cell are now `c' and
`t' rather than `C-c C-c' and `C-c C-t'.  Mention the stupid error message
when using `c' on an empty default with default printer.
(Buffer-local variables in spreadsheets): `symbolic-formulas' was
renamed to `ses--symbolic-formulas' some time ago.

Make `ses--symbolic-formulas' a safe local variable.
(ses-mode-print-map): Add `c' and `t' (suggested by Gareth Rees).
(ses-recalculate-cell): Deal with point being just beyond end of data area (why does this happen?)
(ses-set-curcell): Ditto.
(ses-column-letter): Handle columns beyond 702.  Code written by Gareth Rees.

Get rid of silly life-universe-everything local
variable.  `symbolic-formulas' is now `ses--symbolic-formulas'.

*** empty log message ***

(w32_get_resource): Remove unused variable `ok'.

(w32_get_resource): Remove unused variable `ok'.