[Emacs-diffs] scratch/gnus-cloud 1c37f18 38/61: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

[Teodor Zlatanov]

branch: scratch/gnus-cloud
commit 1c37f18e872a717189f30e8cce1e3bb48413ccbd
Merge: 1b3c761 8419f0d
Author: Ted Zlatanov <address@hidden>
Commit: Ted Zlatanov <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
 doc/misc/trampver.texi      |    2 +-
 lisp/emacs-lisp/map.el      |    2 +-
 lisp/net/trampver.el        |    6 +++---
 lisp/progmodes/cc-engine.el |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi
index cdd008b..6f67f35 100644
--- a/doc/misc/trampver.texi
+++ b/doc/misc/trampver.texi
@@ -8,7 +8,7 @@
 @c In the Tramp GIT, 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.
address@hidden trampver 2.3.0-pre
address@hidden trampver 2.3.0
 
 @c Other flags from configuration
 @set instprefix /usr/local
diff --git a/lisp/emacs-lisp/map.el b/lisp/emacs-lisp/map.el
index 735ab8f..98a8871 100644
--- a/lisp/emacs-lisp/map.el
+++ b/lisp/emacs-lisp/map.el
@@ -373,7 +373,7 @@ MAP can be a list, hash-table or array."
           alist))
 
 (defun map--do-array (function array)
-  "Private function usde to iterate over ARRAY using FUNCTION."
+  "Private function used to iterate over ARRAY using FUNCTION."
   (seq-do-indexed (lambda (elt index)
                      (funcall function index elt))
                    array))
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 64cc47e..aea2605 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -6,7 +6,7 @@
 ;; Author: Kai Großjohann <address@hidden>
 ;; Keywords: comm, processes
 ;; Package: tramp
-;; Version: 2.3.0-pre
+;; Version: 2.3.0
 
 ;; This file is part of GNU Emacs.
 
@@ -32,7 +32,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.3.0-pre"
+(defconst tramp-version "2.3.0"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -54,7 +54,7 @@
 ;; Check for Emacs version.
 (let ((x (if (>= emacs-major-version 23)
     "ok"
-  (format "Tramp 2.3.0-pre is not fit for %s"
+  (format "Tramp 2.3.0 is not fit for %s"
          (when (string-match "^.*$" (emacs-version))
            (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 5fa0403..17415a2 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -5829,7 +5829,7 @@ comment at the start of cc-engine.el for more info."
 ;;   never a backslash escaping the end of line.  If the character preceding
 ;;   this "last possible" character is itself a backslash, this preceding
 ;;   character gets a "punctuation" `syntax-table' value.  If the "(" is
-;;   already at the end of the macro, it gets the "punctuaion" value, and no
+;;   already at the end of the macro, it gets the "punctuation" value, and no
 ;;   "string fence"s are used.
 ;;
 ;;   The effect on the fontification of either of these tactics is that rest of
@@ -6061,7 +6061,7 @@ comment at the start of cc-engine.el for more info."
   ;;
   ;; Point is undefined on both entry and exit, and the return value has no
   ;; significance.
-  ;; 
+  ;;
   ;; This function is called as an after-change function solely due to its
   ;; membership of the C++ value of `c-before-font-lock-functions'.
   (c-save-buffer-state ()