merge trunk

[bpt/emacs.git] / lisp / progmodes / ps-mode.el

diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index a8fc11f..f7de331 100644 (file)
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -1,11 +1,11 @@
 ;;; ps-mode.el --- PostScript mode for GNU Emacs
 
-;; Copyright (C) 1999, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author:     Peter Kleiweg <p.c.j.kleiweg@rug.nl>
 ;; Maintainer: Peter Kleiweg <p.c.j.kleiweg@rug.nl>
 ;; Created:    20 Aug 1997
-;; Version:    1.1h
+;; Version:    1.1i
 ;; Keywords:   PostScript, languages
 
 ;; Yoni Rabkin <yoni@rabkins.net> contacted the maintainer of this
@@ -35,8 +35,9 @@
 \f
 ;;; Code:
 
-(defconst ps-mode-version "1.1h, 16 Jun 2005")
-(defconst ps-mode-maintainer-address "Peter Kleiweg <p.c.j.kleiweg@rug.nl>")
+(defconst ps-mode-version "1.1i, 17 May 2008")
+(defconst ps-mode-maintainer-address
+  "Peter Kleiweg <p.c.j.kleiweg@rug.nl>, bug-gnu-emacs@gnu.org")
 
 (require 'comint)
 (require 'easymenu)
@@ -426,7 +427,6 @@ If nil, use `temporary-file-directory'."
   (define-key ps-mode-map "\177" 'ps-mode-backward-delete-char)
   (define-key ps-mode-map "\t" 'ps-mode-tabkey)
   (define-key ps-mode-map "\r" 'ps-mode-newline)
-  (define-key ps-mode-map [return] 'ps-mode-newline)
   (easy-menu-define ps-mode-main ps-mode-map "PostScript" ps-mode-menu-main))
 
 (unless ps-run-mode-map
@@ -805,7 +805,7 @@ Only one `%' is removed, and it has to be in the first column."
         (while (re-search-forward "[\200-\377]" (marker-position endm) t)
           (setq i (1+ i))
           (backward-char)
-          (insert (format "\\%03o" (string-to-char (buffer-substring (point) (1+ (point))))))
+          (insert (format "\\%03o" (string-to-char (string-make-unibyte (buffer-substring (point) (1+ (point)))))))
           (delete-char 1))
         (message "%d change%s made" i (if (= i 1) "" "s"))
         (set-marker endm nil)))))