diff options
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rw-r--r-- | admin/notes/exit-value | 43 | ||||
| -rw-r--r-- | doc/emacs/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/emacs/programs.texi | 4 | ||||
| -rw-r--r-- | doc/misc/ChangeLog | 5 | ||||
| -rw-r--r-- | doc/misc/ediff.texi | 8 | ||||
| -rw-r--r-- | lisp/ChangeLog | 15 | ||||
| -rw-r--r-- | lisp/files.el | 2 | ||||
| -rw-r--r-- | lisp/net/tramp-ftp.el | 7 | ||||
| -rw-r--r-- | lisp/net/tramp.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/ada-mode.el | 5 | ||||
| -rw-r--r-- | lisp/progmodes/ada-xref.el | 8 | ||||
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-handlers.el | 2 |
14 files changed, 59 insertions, 56 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 7da79325a9..34dc8c9c5c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,9 @@ 2014-08-07 Reuben Thomas <rrt@sc3d.org> + * notes/exit-value: Remove specific discussion of VMS. + +2014-08-07 Reuben Thomas <rrt@sc3d.org> + Refer to MS-DOS using the same name everywhere. * FOR-RELEASE: ``MS-DOG'', ``MSDOG'' and ``msdog'' become diff --git a/admin/notes/exit-value b/admin/notes/exit-value index cad6862c8a..96337e4c8d 100644 --- a/admin/notes/exit-value +++ b/admin/notes/exit-value @@ -1,35 +1,28 @@ ttn 2004-05-09 -The exit value of a program returning to the shell on unixoid systems is -typically 0 for success, and non-0 (such as 1) for failure. For vms it is -odd (1,3,5...) for success, even (0,2,4...) for failure. - -This holds from the point of view of the "shell" (in quotes because vms has a -different dispatch model that is not explained further here). - -From the point of view of the program, nowadays stdlib.h on both type of -systems provides macros `EXIT_SUCCESS' and `EXIT_FAILURE' that should DTRT. - -NB: The numerical values of these macros DO NOT need to fulfill the exit -value requirements outlined in the first paragraph! That is the job of the +The exit value of a program returning to the shell on unixoid systems +is typically 0 for success, and non-0 (such as 1) for failure. This is +not always the case on other systems. + +From the point of view of the program stdlib.h provides macros +`EXIT_SUCCESS' and `EXIT_FAILURE' that should DTRT. N.B. The +numerical values of these macros DO NOT need to fulfill the exit value +requirements outlined in the first paragraph! That is the job of the `exit' function. Thus, this kind of construct shows misunderstanding: - #ifdef VMS + #ifdef WEIRD_OS exit (1); #else exit (0); #endif -Values aside from EXIT_SUCCESS and EXIT_FAILURE are tricky. - - - -ttn 2004-05-12 +Values aside from EXIT_SUCCESS and EXIT_FAILURE are tricky, but can be +used to indicate finer gradations of failure. If this is the only +information available to the caller, clamping such values to +EXIT_FAILURE loses information. If there are other ways to indicate +the problem to the caller (such as a message to stderr) it may be ok +to clamp. In all cases, it is the relationship between the program +and its caller that must be examined. -Values aside from EXIT_SUCCESS and EXIT_FAILURE can be used to indicate -finer gradations of failure. If this is the only information available -to the caller, clamping such values to EXIT_FAILURE loses information. -If there are other ways to indicate the problem to the caller (such as -a message to stderr) it may be ok to clamp. In all cases, it is the -relationship between the program and its caller that must be examined. -[Insert ZAMM quote here.] +[Insert ZAMM quote here.] <-- I presume this refers to ``Zen and the +Art of Motorcycle Maintenance'' - Reuben Thomas <rrt@sc3d.org>. diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 0fd6080569..356bc26722 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,10 @@ 2014-08-07 Reuben Thomas <rrt@sc3d.org> + * programs.texi (Program Modes): Don't advertise VMS DCL support + any more. + +2014-08-07 Reuben Thomas <rrt@sc3d.org> + Refer to MS-DOS using the same name everywhere. * Makefile.in (EMACSSOURCES): ``MS-DOG'', ``MSDOG'' and ``msdog'' diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 05008790b4..4c80449c2a 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -88,8 +88,8 @@ Fortran, Icon, IDL (CORBA), IDLWAVE, Java, Javascript, Metafont 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. +shells, and MS-DOS/MS-Windows @samp{BAT} files, and for makefiles, +DNS master files, and various sorts of configuration files. Ideally, Emacs should have a major mode for each programming language that you might want to edit. If it doesn't have a mode for diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 8f50396b2b..cc0da7e25f 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,8 @@ +2014-08-07 Reuben Thomas <rrt@sc3d.org> + + * ediff.texi (Merging and diff3): Don't mention lack of support + for VMS diff, we no longer support VMS. + 2014-08-07 Michael Albinus <michael.albinus@gmx.de> * tramp.texi (Remote shell setup): Explain, how to change command diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 9d373982fa..4e1806de94 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -350,8 +350,7 @@ All the above functions use the POSIX @code{diff} or @code{diff3} programs to find differences between two files. They process the @code{diff} output and display it in a convenient form. At present, Ediff understands only the plain output from diff. Options such as @samp{-c} are not supported, -nor is the format produced by incompatible file comparison programs such as -the VMS version of @code{diff}. +nor is the format produced by incompatible file comparison programs. The functions @code{ediff-files}, @code{ediff-buffers}, @code{ediff-files3}, @code{ediff-buffers3} first display the coarse, @@ -1945,11 +1944,6 @@ Specifies the default directory to look for patches. @end table -@noindent -@strong{Warning:} Ediff does not support the output format of VMS -@code{diff}. Instead, make sure you are using some implementation of POSIX -@code{diff}, such as @code{gnudiff}. - @node Merging and diff3 @section Merging and diff3 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9948ec0d3c..12f5f5fb84 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,20 @@ 2014-08-07 Reuben Thomas <rrt@sc3d.org> + * progmodes/ada-mode.el: + * net/tramp.el (tramp-handle-file-symlink-p): + * net/tramp-ftp.el (tramp-ftp-file-name-handler): Remove a comment + about VMS, which we no longer support. + * progmodes/ada-xref.el (ada-xref-current): Remove mention of VMS, + and fix a FIXME, using convert-standard-filename in place of + removed ada-convert-file-name. + +2014-08-07 Eli Zaretskii <eliz@gnu.org> + + * files.el (auto-mode-alist): Remove support for VMS from a + pattern. + +2014-08-07 Reuben Thomas <rrt@sc3d.org> + Refer to MS-DOS using the same name everywhere. * arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous diff --git a/lisp/files.el b/lisp/files.el index 597afb9912..5cff5b11ee 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2413,7 +2413,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) ("\\.wy\\'" . wisent-grammar-mode) ;; .emacs or .gnus or .viper following a directory delimiter in ;; Unix or MS-DOS syntax. - ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) + ("[:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) ("\\`\\..*emacs\\'" . emacs-lisp-mode) ;; _emacs following a directory delimiter in MS-DOS syntax ("[:/]_emacs\\'" . emacs-lisp-mode) diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el index d98f6d74a6..a723e57f29 100644 --- a/lisp/net/tramp-ftp.el +++ b/lisp/net/tramp-ftp.el @@ -178,12 +178,7 @@ pass to the OPERATION." (ignore-errors (delete-file tmpfile))))) ;; Normally, the handlers must be discarded. - ;; `inhibit-file-name-handlers' isn't sufficient, because the - ;; local file name could be in Tramp syntax as well (for - ;; example, returning VMS file names like "/DISK$CAM:/AAA"). - ;; That's why we set also `tramp-mode' to nil. - (t (let* (;(tramp-mode nil) - (inhibit-file-name-handlers + (t (let* ((inhibit-file-name-handlers (list 'tramp-file-name-handler 'tramp-completion-file-name-handler (and (eq inhibit-file-name-operation operation) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 921c70135d..17259c6915 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -2998,8 +2998,6 @@ User is always nil." (with-parsed-tramp-file-name filename nil (let ((x (car (file-attributes filename)))) (when (stringp x) - ;; When Tramp is running on VMS, then `file-name-absolute-p' - ;; might do weird things. (if (file-name-absolute-p x) (tramp-make-tramp-file-name method user host x) x))))) diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 68b6c872d3..0d07d57315 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -31,11 +31,6 @@ ;; independent from the GNU Ada compiler GNAT, distributed by Ada ;; Core Technologies. All the other files rely heavily on features ;; provided only by GNAT. -;; -;; Note: this mode will not work with Emacs 19. If you are on a VMS -;; system, where the latest version of Emacs is 19.28, you will need -;; another file, called ada-vms.el, that provides some required -;; functions. ;;; Usage: ;; Emacs should enter Ada mode automatically when you load an Ada file. diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 7cad848fda..4bc37451e6 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -651,12 +651,6 @@ Call `ada-require-project-file' first to ensure a project exists." (find-file (car (cdr pos))) (goto-char (car pos))))) -(defun ada-convert-file-name (name) - "Convert from NAME to a name that can be used by the compilation commands. -This is overridden on VMS to convert from VMS filenames to Unix filenames." - name) -;; FIXME: use convert-standard-filename instead - (defun ada-set-default-project-file (file) "Set FILE as the current project file." (interactive "fProject file:") @@ -1465,7 +1459,7 @@ by replacing the file extension with `.ali'." (get-file-buffer ali-file-name)) (kill-buffer (get-file-buffer ali-file-name))) - (let* ((name (ada-convert-file-name file)) + (let* ((name (convert-standard-filename file)) (body-name (or (ada-get-body-name name) name))) ;; Always recompile the body when we can. We thus temporarily switch to a diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 92945b3795..9554c6e519 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,8 @@ +2014-08-07 Reuben Thomas <rrt@sc3d.org> + + * url-handlers.el: Remove a comment about VMS, which we no longer + support. + 2014-08-03 Paul Eggert <eggert@cs.ucla.edu> Don't mishandle dates in the year 9999 (Bug#18176). diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el index 704c743bfc..6b7ab8c9ce 100644 --- a/lisp/url/url-handlers.el +++ b/lisp/url/url-handlers.el @@ -51,7 +51,7 @@ ;; delete-directory Finished (DAV) ;; delete-file Finished (DAV) ;; diff-latest-backup-file -;; directory-file-name unnecessary (what about VMS)? +;; directory-file-name unnecessary ;; directory-files Finished (DAV) ;; dired-call-process ;; dired-compress-file |