Merge branch 'emacs-25-merge'

[gnu-emacs] / lisp / progmodes / simula.el

diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index d71c9adbef4d65b082dd23f85d5c7d6a3576169c..d3ee9b5b4b2b7857b9f144140962e8cb6957f526 100644 (file)
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -1,6 +1,6 @@
 ;;; simula.el --- SIMULA 87 code editing commands for Emacs
 
-;; Copyright (C) 1992, 1994, 1996, 2001-2013 Free Software Foundation,
+;; Copyright (C) 1992, 1994, 1996, 2001-2015 Free Software Foundation,
 ;; Inc.
 
 ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no>
@@ -244,8 +244,7 @@ for SIMULA mode to function correctly."
 ; it determines the flavor of the Emacs running
 
 (defvar simula-mode-menu
-  '(["Report Bug"            simula-submit-bug-report t]
-    ["Indent Line"           simula-indent-line t]
+  '(["Indent Line"           simula-indent-line t]
     ["Backward Statement"     simula-previous-statement t]
     ["Forward Statement"      simula-next-statement t]
     ["Backward Up Level"      simula-backward-up-level t]
@@ -286,10 +285,6 @@ for SIMULA mode to function correctly."
     ;; Emacs 19 defines menus in the mode map
     (define-key map [menu-bar simula]
       (cons "SIMULA" (make-sparse-keymap "SIMULA")))
-    (define-key map [menu-bar simula bug-report]
-      '("Submit Bug Report" . simula-submit-bug-report))
-    (define-key map [menu-bar simula separator-indent]
-      '("--"))
     (define-key map [menu-bar simula indent-exp]
       '("Indent Expression" . simula-indent-exp))
     (define-key map [menu-bar simula indent-line]
@@ -349,22 +344,22 @@ Variables controlling indentation style:
     with respect to the previous line of the statement.
  `simula-label-offset' -4711
     Offset of SIMULA label lines relative to usual indentation.
- `simula-if-indent' '(0 . 0)
+ `simula-if-indent' (0 . 0)
     Extra indentation of THEN and ELSE with respect to the starting IF.
     Value is a cons cell, the car is extra THEN indentation and the cdr
     extra ELSE indentation.  IF after ELSE is indented as the starting IF.
- `simula-inspect-indent' '(0 . 0)
+ `simula-inspect-indent' (0 . 0)
     Extra indentation of WHEN and OTHERWISE with respect to the
     corresponding INSPECT.  Value is a cons cell, the car is
     extra WHEN indentation and the cdr extra OTHERWISE indentation.
  `simula-electric-indent' nil
     If this variable is non-nil, `simula-indent-line'
     will check the previous line to see if it has to be reindented.
- `simula-abbrev-keyword' 'upcase
+ `simula-abbrev-keyword' `upcase'
     Determine how SIMULA keywords will be expanded.  Value is one of
     the symbols `upcase', `downcase', `capitalize', (as in) `abbrev-table',
     or nil if they should not be changed.
- `simula-abbrev-stdproc' 'abbrev-table
+ `simula-abbrev-stdproc' `abbrev-table'
     Determine how standard SIMULA procedure and class names will be
     expanded.  Value is one of the symbols `upcase', `downcase', `capitalize',
     (as in) `abbrev-table', or nil if they should not be changed.
@@ -1622,28 +1617,11 @@ If not nil and not t, move to limit of search and return nil."
 (defconst simula-mode-help-address "bug-gnu-emacs@gnu.org"
   "Address accepting submission of `simula-mode' bug reports.")
 
-(defun simula-submit-bug-report ()
-  "Submit via mail a bug report on `simula-mode'."
-  (interactive)
-  (and
-   (y-or-n-p "Do you want to submit a report on simula-mode? ")
-   (reporter-submit-bug-report
-    simula-mode-help-address
-    (concat "simula-mode from Emacs " emacs-version)
-    (list
-     ;; report only the vars that affect indentation
-     'simula-indent-level
-     'simula-substatement-offset
-     'simula-continued-statement-offset
-     'simula-label-offset
-     'simula-if-indent
-     'simula-inspect-indent
-     'simula-electric-indent
-     'simula-abbrev-keyword
-     'simula-abbrev-stdproc
-     'simula-abbrev-file
-     'simula-tab-always-indent
-     ))))
+(make-obsolete-variable 'simula-mode-help-address 'report-emacs-bug-address
+                       "24.4")
+
+(define-obsolete-function-alias 'simula-submit-bug-report
+  'report-emacs-bug "24.4")
 
 (provide 'simula)