Miles Bader
c12ecb0af9
Merge from emacs--rel--22
...
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-923
2007-11-09 09:45:30 +00:00
Dan Nicolaescu
e83d1fe875
* ediff-init.el (ediff-xemacs-p, ediff-emacs-p): Remove.
...
(ediff-has-face-support-p, ediff-BAD-INFO, ediff-check-version)
(ediff-current-diff-A, ediff-current-diff-B)
(ediff-current-diff-C, ediff-fine-diff-C, ediff-fine-diff-A)
(ediff-fine-diff-B, ediff-fine-diff-Ancestor, ediff-even-diff-A)
(ediff-even-diff-B, ediff-even-diff-C, ediff-even-diff-Ancestor)
(ediff-odd-diff-A, ediff-odd-diff-B, ediff-odd-diff-C)
(ediff-odd-diff-Ancestor, ediff-reset-mouse):
* ediff-wind.el (ediff-narrow-control-frame-leftward-shift)
(ediff-setup-windows-plain-merge)
(ediff-setup-windows-plain-compare, ediff-setup-control-frame)
(ediff-refresh-control-frame, ediff-get-visible-buffer-window):
* ediff-util.el (ediff-setup-keymap, )
(ediff-toggle-wide-display, ediff-toggle-multiframe)
(ediff-toggle-use-toolbar, ediff-really-quit)
(ediff-good-frame-under-mouse)
(ediff-highlight-diff-in-one-buffer)
(ediff-remove-flags-from-buffer, ediff-place-flags-in-buffer1)
(ediff-make-bullet-proof-overlay):
* ediff-mult.el (ediff-setup-meta-map, ediff-emacs-p)
(ediff-set-meta-overlay):
* ediff-help.el (ediff-help-region-map, ediff-set-help-overlays):
* ediff.el (ediff-documentation): Replace ediff-xemacs-p and
ediff-emacs-p with their former definitions.
* emulation/viper-init.el (viper-xemacs-p, viper-emacs-p): Remove.
(viper-has-face-support-p, viper-inactivate-input-method)
(viper-activate-input-method)
(viper-use-replace-region-delimiters, viper-restore-cursor-type):
* emulation/viper-mous.el (viper-multiclick-timeout)
(viper-surrounding-word, viper-mouse-click-insert-word)
(viper-mouse-click-search-word, viper-parse-mouse-key):
* emulation/viper-macs.el (viper-char-array-to-macro):
* emulation/viper.el (viper-go-away, viper-set-hooks)
(viper-non-hook-settings):
* emulation/viper-util.el (viper-get-saved-cursor-color-in-replace-mode)
(viper-get-saved-cursor-color-in-insert-mode)
(viper-get-saved-cursor-color-in-emacs-mode)
(viper-check-version, viper-get-visible-buffer-window)
(viper-file-checked-in-p, viper-set-replace-overlay)
(viper-set-replace-overlay-glyphs, viper-set-minibuffer-overlay)
(viper-check-minibuffer-overlay, viper-read-key-sequence)
(viper-key-to-emacs-key): Replace viper-xemacs-p and viper-emacs-p
with their former definitions.
(viper-eventify-list-xemacs): Only do work for XEmacs.
(viper-set-unread-command-events): Only do work for Emacs.
(viper-overlay-p, viper-make-overlay, viper-overlay-live-p)
(viper-move-overlay, viper-overlay-start, viper-overlay-end)
(viper-overlay-get, viper-overlay-put, viper-read-event)
(viper-characterp, viper-int-to-char, viper-get-face)
(viper-color-defined-p, viper-iconify): New defaliases replacing
the old fsets.
* progmodes/fortran.el (comment-region-function)
(uncomment-region-function): Pacify byte compiler.
* vc.el (vc-diff-internal): Remove code for an old version of
gnus.
2007-11-09 05:20:57 +00:00
Nick Roberts
c91d7cbb08
(gud-gdb): Remove vestigial gdba doc and code.
2007-11-05 06:40:26 +00:00
Glenn Morris
7a05f2bd9a
(fortran-mode-map): Don't bind M-;.
...
(fortran-mode): Set values for comment-region-function,
uncomment-region-function and comment-insert-comment-function.
(fortran-uncomment-region): New function.
2007-11-03 03:03:31 +00:00
Glenn Morris
8e004a4407
Whitespace.
2007-11-02 08:21:04 +00:00
Glenn Morris
6da047e741
(tags-table-mode): Disable undo.
2007-11-02 08:19:17 +00:00
Glenn Morris
5ec19a1188
(tags-table-mode): Disable undo.
2007-11-02 08:18:24 +00:00
Stefan Monnier
c01b997152
(python-mode-abbrev-table): Use :regexp.
...
Merge defvar and define-abbrev-table.
(def-python-skeleton): Use :case-fixed and :enable-function.
(python-abbrev-pc-hook, python-abbrev-syntax-table, python-pea-hook): Remove.
(python-mode): Don't modify pre-abbrev-expand-hook.
2007-10-31 20:00:36 +00:00
Dan Nicolaescu
91dd4dc442
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
...
only if it is bound.
* textmodes/reftex.el: Move autoloads for before all uses.
(reftex-make-overlay, reftex-overlay-put, reftex-move-overlay)
(reftex-delete-overlay): Move to the top level with the condition
in the body.
* progmodes/simula.el: Use when instead of if.
* iimage.el (iimage-locate-file): Define unconditionally.
* mail/mailabbrev.el (mail-abbrev-next-line):
* emulation/vip.el (vip-enlarge-region, vip-line)
(vip-next-line-at-bol, vip-previous-line)
(vip-previous-line-at-bol, vip-find-char, vip-put-back, ex-read):
Wrap with-no-warnings around uses of next-line and previous-line.
* ediff.el (run-ediff-from-cvs-buffer):
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Remove
function not used by pcl-cvs anymore.
(noninteractive, generic-sc-get-latest-rev)
(ediff-generic-sc-internal, ediff-generic-sc-merge-internal):
Delete support for long obsolete generic-sc.el.
2007-10-31 06:28:09 +00:00
Glenn Morris
5b549c31a7
Tassilo Horn <tassilo at member.fsf.org>
...
(ps-mode-map): Enable doc-view-minor-mode.
2007-10-30 06:31:50 +00:00
Nick Roberts
f8fef1ceba
(gdb-delete-out-of-scope): New option.
...
(gdb-var-update-handler-1): Use it.
2007-10-30 05:37:34 +00:00
Dan Nicolaescu
6546555e7d
* 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.
2007-10-29 15:33:04 +00:00
Glenn Morris
5e0b2841c7
(cc-bytecomp-ignore-obsolete): Use byte-compile-disable-warning.
2007-10-28 23:50:30 +00:00
Dan Nicolaescu
f83fb05aa1
Reorder conditions to avoid warnings.
2007-10-27 20:27:34 +00:00
Glenn Morris
7e9d87d003
(fortran-tab-mode-string): Revert change merged in from EMACS_22 branch.
...
This code behaves differently on the trunk.
2007-10-27 19:14:08 +00:00
Glenn Morris
e2bd4dd4d0
(f90-font-lock-keywords-1): Revert change merged in from EMACS_22 branch.
...
The trunk version does this differently.
2007-10-27 19:12:27 +00:00
Miles Bader
fdc9061358
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
2007-10-27 09:07:17 +00:00
Dan Nicolaescu
3fe5c37a0c
* 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.
2007-10-26 22:24:14 +00:00
Richard M. Stallman
5ca7d652e5
(ps-mode-map): Delete C-c v binding.
...
Put ps-run-clear on C-c C-l.
2007-10-26 09:53:14 +00:00
Glenn Morris
b21c7071ac
(f90-indented-comment-re, f90-directive-comment-re)
...
(f90-break-delimiters): Mark these regexps as safe if they are strings.
2007-10-25 04:00:42 +00:00
Glenn Morris
f28af2ae4f
(f90-indented-comment-re, f90-directive-comment-re)
...
(f90-break-delimiters): Mark these regexps as safe if they are strings.
2007-10-25 03:58:45 +00:00
Glenn Morris
be6a2f1a5a
(fortran-comment-line-start-skip, fortran-directive-re):
...
Mark these regexps as safe if they are strings.
2007-10-25 03:57:21 +00:00
Glenn Morris
cb1e8a7540
(fortran-comment-line-start-skip, fortran-directive-re):
...
Mark these regexps as safe if they are strings.
2007-10-25 03:57:09 +00:00
Glenn Morris
b1ca774080
(f90-keywords-re, f90-keywords-level-3-re): Add `non_intrinsic'.
...
(f90-constants-re): Add ieee modules.
(f90-typedef-matcher, f90-typedec-matcher)
(f90-imenu-type-matcher): New functions.
(f90-font-lock-keywords-1): Give module procedures function-name face.
Use `f90-typedef-matcher' for derived types. Fix `abstract interface'.
Add `use, intrinsic'.
(f90-font-lock-keywords-2): Use `f90-typedec-matcher' for derived types.
Move start of `enum' blocks to separate entry.
(f90-start-block-re): Fix `type', `abstract interface'.
(f90-imenu-generic-expression): Use `f90-imenu-type-matcher' for
derived types.
(f90-mode-abbrev-table): Add `abstract interface', `asynchronous',
`elemental', change `enumerator'.
(f90-no-block-limit): Fix `abstract interface'.
2007-10-25 03:51:15 +00:00
Richard M. Stallman
ff04b3780d
(ps-mode-map): Delete C-c v binding.
2007-10-25 02:23:34 +00:00
Stefan Monnier
d720f96e93
(python-current-defun): Remove left-over assignment to `start'.
2007-10-23 21:27:20 +00:00
Dan Nicolaescu
700fb4bac4
(gdb-source-window, gud-tooltip-mode)
...
(hl-line-mode, hl-line-sticky-flag): Pacify byte compiler.
2007-10-23 15:44:23 +00:00
Glenn Morris
9d23c92525
Untabify.
2007-10-23 07:02:42 +00:00
Glenn Morris
b2752d937b
(f90-do-indent, f90-if-indent)
...
(f90-type-indent, f90-program-indent, f90-associate-indent)
(f90-continuation-indent, f90-comment-region)
(f90-beginning-ampersand, f90-smart-end)
(f90-break-before-delimiters, f90-auto-keyword-case)
(f90-leave-line-no, f90-mode-hook):
Give an appropriate safe-local-variable property.
2007-10-23 07:00:38 +00:00
Glenn Morris
d6bb9d8c18
(f90-do-indent, f90-if-indent)
...
(f90-type-indent, f90-program-indent)
(f90-continuation-indent, f90-comment-region)
(f90-beginning-ampersand, f90-smart-end)
(f90-break-before-delimiters, f90-auto-keyword-case)
(f90-leave-line-no, f90-mode-hook):
Give an appropriate safe-local-variable property.
(f90-font-lock-keywords-2): Fix `go to' regexp.
2007-10-23 07:00:13 +00:00
Glenn Morris
6ac8618ab2
(fortran-tab-mode-default)
...
(fortran-tab-mode-string, fortran-do-indent, fortran-if-indent)
(fortran-structure-indent, fortran-continuation-indent)
(fortran-comment-indent, fortran-comment-line-extra-indent)
(fortran-comment-line-start)
(fortran-minimum-statement-indent-fixed)
(fortran-minimum-statement-indent-tab)
(fortran-comment-indent-char, fortran-line-number-indent)
(fortran-check-all-num-for-matching-do)
(fortran-blink-matching-if, fortran-continuation-string)
(fortran-comment-region, fortran-electric-line-number)
(fortran-column-ruler-fixed, fortran-column-ruler-tab)
(fortran-analyze-depth, fortran-break-before-delimiters):
Give an appropriate safe-local-variable property.
2007-10-23 06:52:04 +00:00
Glenn Morris
1aa6c83acd
(fortran-tab-mode-default)
...
(fortran-tab-mode-string, fortran-do-indent, fortran-if-indent)
(fortran-structure-indent, fortran-continuation-indent)
(fortran-comment-indent, fortran-comment-line-extra-indent)
(fortran-comment-line-start)
(fortran-minimum-statement-indent-fixed)
(fortran-minimum-statement-indent-tab)
(fortran-comment-indent-char, fortran-line-number-indent)
(fortran-check-all-num-for-matching-do)
(fortran-blink-matching-if, fortran-continuation-string)
(fortran-comment-region, fortran-electric-line-number)
(fortran-column-ruler-fixed, fortran-column-ruler-tab)
(fortran-analyze-depth, fortran-break-before-delimiters):
Give an appropriate safe-local-variable property.
2007-10-23 06:51:54 +00:00
Glenn Morris
5ab33946cc
Add some support for Fortran 2003 syntax:
...
(f90-type-indent): Now also applies to `enum'.
(f90-associate-indent): New user option.
(f90-keywords-re, f90-keywords-level-3-re, f90-procedures-re):
Add some F2003 keywords.
(f90-constants-re): New constant.
(f90-font-lock-keywords-1): Add `associate' blocks, and `abstract
Interface'.
(f90-font-lock-keywords-2): Add `enumerator', `generic', `procedure',
`class'. Arguments for `type'/`class' may have spaces. Add a new
element for functions with specified types. Add `end enum' and
`select type'. Add `implicit enumerator' and `procedure'. Add
`class default' and `type is', `class is'. Fix `go to' regexp.
(f90-font-lock-keywords-3): Add `asynchronous' attribute.
(f90-font-lock-keywords-4): Add `f90-constants-re'.
(f90-blocks-re): Add `enum' and `associate'.
(f90-else-like-re): Add `class is', `type is', and `class default'.
(f90-end-type-re): Add `enum'.
(f90-end-associate-re, f90-typeis-re): New constants.
(f90-end-block-re): Add `enum' and `associate'. Change from
optional whitespace to end-of-word, to avoid `enumerator'.
(f90-start-block-re): Add `select type', `abstract interface', and
`enum'. Avoid `type is', and `type (sometype)'.
(f90-mode-abbrev-table): Add `enumerator', `protected', and `volatile'.
(f90-mode): Doc fix.
(f90-looking-at-select-case): Doc fix. Add `select type'.
(f90-looking-at-associate): New function,
(f90-looking-at-type-like): Avoid `type is' and `type (sometype)'.
Add `enum' and `abstract interface'.
(f90-no-block-limit): Add `select type' and `abstract interface'.
(f90-get-correct-indent, f90-calculate-indent)
(f90-end-of-block, f90-beginning-of-block, f90-next-block)
(f90-indent-region, f90-match-end): : Handle `associate' blocks.
2007-10-22 08:17:39 +00:00
Glenn Morris
640f9e264a
Untabify.
2007-10-22 07:49:16 +00:00
Glenn Morris
d4654cff74
Remove leading "*" from defcustom doc-strings.
2007-10-22 07:46:35 +00:00
Glenn Morris
ca03b5a94d
Martin Rudalics <rudalics at gmx.at>
...
(fortran-mode-map, fortran-window-create): Use window-full-width-p.
2007-10-22 07:40:37 +00:00
Glenn Morris
b8e4cd1d74
Martin Rudalics <rudalics at gmx.at>
...
(fortran-mode-map, fortran-window-create): Use window-full-width-p.
2007-10-22 07:40:12 +00:00
Dan Nicolaescu
f82460271e
* emulation/edt-mapper.el (function-key-map):
...
(edt-map-key): Make it a function instead of using fset. Inline
edt-gnu-map-key and edt-lucid-map-key. Use featurep 'xemacs.
(edt-gnu-map-key, edt-lucid-map-key): Remove.
(edt-x-emacs-p): Remove.
(edt-emacs-variant, edt-window-system, edt-xserver):
Use featurep 'xemacs.
* net/eudc.el: Use (featurep 'xemacs) instead of the string test.
Replace eudc-xemacs-p with its definition.
(eudc-xemacs-p, eudc-emacs-p, eudc-xemacs-mule-p)
(eudc-emacs-mule-p): Remove.
(eudc-install-menu, eudc-mode): Replace eudc-emacs-p and
eudc-xemacs-p with feature tests.
* net/eudc-bob.el (eudc-bob-generic-menu, eudc-bob-mail-keymap)
(eudc-bob-url-keymap, eudc-bob-sound-keymap)
(eudc-bob-generic-keymap, eudc-bob-popup-menu)
(eudc-bob-toggle-inline-display):
* net/eudc-hotlist.el (eudc-hotlist-emacs-menu): Replace
eudc-emacs-p and eudc-xemacs-p with feature tests.
* net/eudcb-ph.el (eudc-ph-open-session): Replace
eudc-xemacs-mule-p with its former definition.
* progmodes/octave-mod.el (octave-xemacs-p): Remove.
(octave-abbrev-start): Replace octave-xemacs-p with
(featurep 'xemacs).
* progmodes/vera-mode.el (vera-xemacs): Remove.
(vera-mode-syntax-table): Replace vera-xemacs with
(featurep 'xemacs).
* progmodes/vhdl-mode.el (vhdl-xemacs): Remove.
(vhdl-doc-mode, vhdl-doc-variable, vhdl-compile-init)
(vhdl-speedbar-initialize, vhdl-ps-print-init)
(vhdl-forward-comment, vhdl-mode-map-init, vhdl-show-messages)
(vhdl-emacs-22, vhdl-emacs-21): Replace vhdl-xemacs
with (featurep 'xemacs).
* progmodes/antlr-mode.el (cond-emacs-xemacs-macfn, defunx)
(save-buffer-state-x):
* obsolete/fast-lock.el (fast-lock-verbose):
* emulation/viper-init.el (viper-xemacs-p)
(viper-cond-compile-for-xemacs-or-emacs):
* emacs-lisp/checkdoc.el (checkdoc-minor-mode-map):
* ps-print.el (case-fold-search):
* ediff-hook.el (ediff-cond-compile-for-xemacs-or-emacs):
* calculator.el (calculator-help): Use featurep 'xemacs.
2007-10-21 17:22:04 +00:00
Dan Nicolaescu
3cd79f623b
* progmodes/prolog.el: Undo previous change.
...
(comint-prompt-regexp, comint-process-echoes): Pacify
byte-compiler.
* progmodes/dcl-mode.el:
* play/yow.el:
* calendar/todo-mode.el:
* calendar/cal-hebrew.el:
* vc-hg.el: Undo previous change.
* vms-patch.el: Likewise.
(print-region-function): Pacify byte-compiler.
2007-10-21 14:54:34 +00:00
Dan Nicolaescu
2f42c75fb0
* progmodes/gud.el (gud-target-name): Move definition before use.
...
* progmodes/dcl-mode.el: Require imenu at compile time.
* progmodes/cc-engine.el (c-maybe-stale-found-type): Pacify
byte-compiler.
* obsolete/fast-lock.el: Use featurep test instead of
string-match.
* eshell/esh-mode.el (eshell-handle-ansi-color): Require
ansi-color at compile time too.
* eshell/em-unix.el (eshell/info): Require info at compile time
too.
* w32-fns.el: Require w32-vars.
* diff-mode.el (diff-refine-hunk): Require smerge-mode at compile
time too.
2007-10-21 07:33:32 +00:00
Dan Nicolaescu
975460179e
* term/x-win.el (x-gtk-stock-map, icon-map-list)
...
(x-gtk-map-stock): Delete duplicated definitions from merge.
* progmodes/octave-mod.el: Require octave-inf at compile time
* progmodes/compile.el (compilation-skip-to-next-location)
(compilation-skip-threshold, compilation-skip-visited): Move
definitions earlier.
* play/zone.el (zone-fall-through-ws):
* play/landmark.el (lm-move-down, lm-move-up):
* play/handwrite.el (handwrite):
* mail/mspools.el (mspools-visit-spool):
* wdired.el (wdired-next-line, wdired-previous-line):
* tar-mode.el (tar-subfile-save-buffer):
* scroll-lock.el (scroll-lock-next-line)
(scroll-lock-previous-line):
* image-dired.el (image-dired-next-line)
(image-dired-previous-line):
* ediff-help.el (ediff-help-message-line-length): Use
forward-line.
* smerge-mode.el (smerge-auto-refine):
* diff-mode.el (diff-auto-refine): Add :group.
* play/yow.el: Require doctor at compile time.
* vmsproc.el: Provide vmsproc.
(command-send-input): Use forward-line.
* vms-patch.el: Require ps-print and vmsproc at compile time.
* vc-mtn.el (log-view-message-re, log-view-file-re)
(log-view-font-lock-keywords): Pacify byte-compiler.
* vc-hg.el: Require log-view at compile time.
2007-10-20 06:30:18 +00:00
Glenn Morris
dd026a6a38
(f90-font-lock-keywords-2, f90-looking-at-type-like): Fix regexp typos.
2007-10-20 03:56:39 +00:00
Glenn Morris
f42fc119bc
(f90-font-lock-keywords-2, f90-looking-at-type-like): Fix regexp typos.
2007-10-20 03:53:59 +00:00
Dan Nicolaescu
7caf6803d5
* textmodes/two-column.el (2C-split, 2C-merge):
...
* textmodes/bib-mode.el (bib-find-key, mark-bib):
* progmodes/idlw-shell.el (idlwave-shell-move-or-history):
* progmodes/etags.el (find-tag-in-order, etags-tags-apropos)
* progmodes/ada-xref.el (ada-get-all-references):
* obsolete/mlsupport.el (ml-next-line, ml-previous-line):
* emulation/vi.el (vi-previous-line-first-nonwhite)
(vi-effective-range, vi-put-before):
* emulation/edt.el (edt-next-line, edt-previous-line)
(edt-paragraph-forward): Use forward-line.
* progmodes/etags.el (tags-apropos): Require apropos at compile
time too.
* progmodes/prolog.el: Require comint when compiling.
(inferior-prolog-flavor): Move defvar before use.
2007-10-19 18:41:09 +00:00
Thien-Thi Nguyen
8cd670fbef
(delphi-newline): Use forward-line.
2007-10-18 16:01:02 +00:00
Stefan Monnier
7704151348
(compilation-next-error-function): Fix timestamp
...
handling, so compilation-fake-loc works again.
2007-10-17 16:24:33 +00:00
Glenn Morris
f3523b17a8
(cc-imenu-c++-generic-expression): Tweak regexp to avoid overflow.
2007-10-17 01:37:23 +00:00
Glenn Morris
41a962dd92
(cc-imenu-c++-generic-expression): Tweak regexp to avoid overflow.
2007-10-17 01:36:24 +00:00
Miles Bader
b2529d56b5
Merge from emacs--rel--22
...
Patches applied:
* emacs--rel--22 (patch 116-121)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-889
2007-10-15 02:07:53 +00:00
Glenn Morris
9099b37326
(select-tags-table): Disable undo in the `*Tags Table List*' buffer.
2007-10-14 02:52:58 +00:00