aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/ack.texi4
-rw-r--r--doc/emacs/programs.texi10
-rw-r--r--etc/NEWS28
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/opascal.el16
6 files changed, 44 insertions, 22 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 2a0123ee26..ce43ff1a47 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
2014-01-26 Glenn Morris <[email protected]>
+ * ack.texi (Acknowledgments):
+ * programs.texi (Program Modes):
+ Update for delphi.el -> opascal.el renaming.
+
* misc.texi (Sorting): Add findex for reverse-region.
* killing.texi (Deletion): Mention delete-duplicate-lines.
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 74d96c4aa7..8f8e741c91 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -126,8 +126,8 @@ by Oliver Seidel), a package for maintaining @file{TODO} list files.
Anna M. Bigatti wrote @file{cal-html.el}, which produces HTML calendars.
@item
-Ray Blaak and Simon South wrote @file{delphi.el}, a mode for editing
-Delphi (Object Pascal) source code.
+Ray Blaak and Simon South wrote @file{opascal.el}, a mode for editing
+Object Pascal source code.
@item
Martin Blais, Stefan Merten, and David Goodger wrote @file{rst.el}, a
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index f38edd4fe7..8e62a03129 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -75,17 +75,17 @@ mode for the C programming language is @code{c-mode}.
@cindex VHDL mode
@cindex M4 mode
@cindex Shell-script mode
-@cindex Delphi mode
+@cindex OPascal mode
@cindex PostScript mode
@cindex Conf mode
@cindex DNS mode
@cindex Javascript mode
Emacs has programming language modes for Lisp, Scheme, the
-Scheme-based DSSSL expression language, Ada, ASM, AWK, C, C++, Delphi,
+Scheme-based DSSSL expression language, Ada, ASM, AWK, C, C++,
Fortran, Icon, IDL (CORBA), IDLWAVE, Java, Javascript, Metafont
-(@TeX{}'s companion for font creation), Modula2, Objective-C, Octave,
-Pascal, Perl, Pike, PostScript, Prolog, Python, Ruby, Simula, Tcl, and
-VHDL@. An alternative mode for Perl is called CPerl mode. Modes are
+(@TeX{}'s companion for font creation), Modula2, Object Pascal, Objective-C,
+Octave, Pascal, Perl, Pike, PostScript, Prolog, Python, Ruby, Simula, Tcl,
+and VHDL@. An alternative mode for Perl is called CPerl mode. Modes are
also available for the scripting languages of the common GNU and Unix
shells, VMS DCL, and MS-DOS/MS-Windows @samp{BAT} files, and for
makefiles, DNS master files, and various sorts of configuration files.
diff --git a/etc/NEWS b/etc/NEWS
index f913b80da8..f934bc30bd 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -634,14 +634,19 @@ See MH-E-NEWS for details.
*** Documentation lookup/search.
-** OPascal mode is the new name for Delphi mode.
++++
+** OPascal mode is the new name for Delphi mode
+---
*** All delphi-* variables and functions have been renamed to opascal-*.
+Obsolete aliases exist for those likely to have been used externally.
-*** `delphi-newline-always-indents' is not supported any more.
+---
+*** The option `delphi-newline-always-indents' has been removed.
Use `electric-indent-mode' instead.
-*** `delphi-tab' is gone, replaced by `indent-for-tab-command'.
+---
+*** The TAB key runs the standard `indent-for-tab-command', not `delphi-tab'.
** Package
@@ -690,17 +695,23 @@ rather than mboxo. Customize `unrmail-mbox-format' to change this.
** Ruby mode
-*** New option `ruby-encoding-magic-comment-style'.
+---
+*** Improved syntax highlighting and indentation.
-*** New option `ruby-custom-encoding-magic-comment-template'.
+---
+*** New `electric-indent-mode' integration.
-*** Improved syntax highlighting and indentation.
+---
+*** New option `ruby-encoding-magic-comment-style'.
-*** More Ruby file types have been added to `auto-mode-alist'.
+---
+*** New option `ruby-custom-encoding-magic-comment-template'.
+---
*** New option `ruby-align-to-stmt-keywords'.
-*** New `electric-indent-mode' integration.
+---
+*** More Ruby file types have been added to `auto-mode-alist'.
** Search and Replace
@@ -760,6 +771,7 @@ All non-ancient Bash versions support this option.
Emacs can learn the appropriate indentation settings if you provide it
with an indented sample file.
+---
** New Term mode option `term-suppress-hard-newline'.
+++
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cded7bcb0f..fcbff5b8ee 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
2014-01-26 Glenn Morris <[email protected]>
+ * progmodes/opascal.el (opascal-tab-always-indents, opascal-tab):
+ Doc fix. Make obsolete.
+ (opascal-mode): No longer mention opascal-tab-always-indents in doc.
+
* sort.el (delete-duplicate-lines): Doc fix.
2014-01-25 RĂ¼diger Sonderfeld <[email protected]>
diff --git a/lisp/progmodes/opascal.el b/lisp/progmodes/opascal.el
index 0ea8b2e2ea..dfb2b72a9d 100644
--- a/lisp/progmodes/opascal.el
+++ b/lisp/progmodes/opascal.el
@@ -106,10 +106,14 @@ end; end;"
(define-obsolete-variable-alias
'delphi-tab-always-indents 'opascal-tab-always-indents "24.4")
(defcustom opascal-tab-always-indents tab-always-indent
- "Non-nil means TAB in OPascal mode should always reindent the current line,
-regardless of where in the line point is when the TAB command is used."
+ "Non-nil means `opascal-tab' should always reindent the current line.
+That is, regardless of where in the line point is at the time."
:type 'boolean)
+(make-obsolete-variable 'opascal-tab-always-indents
+ "use `indent-for-tab-command' and `tab-always-indent'."
+ "24.4")
+
(defconst opascal-directives
'(absolute abstract assembler automated cdecl default dispid dynamic
export external far forward index inline message name near nodefault
@@ -1447,8 +1451,8 @@ If before the indent, the point is moved to the indent."
(defun opascal-tab ()
- "Indent the region, when Transient Mark mode is enabled and the region is
-active. Otherwise, indent the current line or insert a TAB, depending on the
+ "Indent the region, if Transient Mark mode is on and the region is active.
+Otherwise, indent the current line or insert a TAB, depending on the
value of `opascal-tab-always-indents' and the current line position."
(interactive)
(cond ((use-region-p)
@@ -1465,6 +1469,7 @@ value of `opascal-tab-always-indents' and the current line position."
;; Otherwise, insert a tab character.
(insert "\t"))))
+(make-obsolete 'opascal-tab 'indent-for-tab-command "24.4")
(defun opascal-is-directory (path)
;; True if the specified path is an existing directory.
@@ -1754,9 +1759,6 @@ Customization:
Extra indentation for blocks in compound statements.
`opascal-case-label-indent' (default 0)
Extra indentation for case statement labels.
- `opascal-tab-always-indents' (default `tab-always-indents')
- Non-nil means TAB in OPascal mode should always reindent the current line,
- regardless of where in the line point is when the TAB command is used.
`opascal-search-path' (default .)
Directories to search when finding external units.
`opascal-verbose' (default nil)