From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#14458: 24.3; specman-mode_v1.22.el not compatible with emacs 24.x Date: Fri, 24 May 2013 15:54:13 -0400 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1369425321 22290 80.91.229.3 (24 May 2013 19:55:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 24 May 2013 19:55:21 +0000 (UTC) Cc: Avi Farjoun , Patrick Oury , Mahesh Soni , Orit Greengrass , 14458@debbugs.gnu.org To: Frederic Pouyet Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri May 24 21:55:20 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Ufy59-0005KO-QQ for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 May 2013 21:55:20 +0200 Original-Received: from localhost ([::1]:39801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ufy59-0005z6-EQ for geb-bug-gnu-emacs@m.gmane.org; Fri, 24 May 2013 15:55:19 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:35825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ufy53-0005yo-DI for bug-gnu-emacs@gnu.org; Fri, 24 May 2013 15:55:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ufy51-0003bk-Kp for bug-gnu-emacs@gnu.org; Fri, 24 May 2013 15:55:13 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:44257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ufy51-0003bf-DV for bug-gnu-emacs@gnu.org; Fri, 24 May 2013 15:55:11 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1Ufy5q-0003yf-7P for bug-gnu-emacs@gnu.org; Fri, 24 May 2013 15:56:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 24 May 2013 19:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14458 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 14458-submit@debbugs.gnu.org id=B14458.136942531515171 (code B ref 14458); Fri, 24 May 2013 19:56:02 +0000 Original-Received: (at 14458) by debbugs.gnu.org; 24 May 2013 19:55:15 +0000 Original-Received: from localhost ([127.0.0.1]:60843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Ufy54-0003wd-FI for submit@debbugs.gnu.org; Fri, 24 May 2013 15:55:15 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:40138 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1Ufy52-0003wV-8q for 14458@debbugs.gnu.org; Fri, 24 May 2013 15:55:13 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Ufy45-0006am-Fe; Fri, 24 May 2013 15:54:13 -0400 X-Spook: military beanpole Audiotel infowar subversive North Korea X-Ran: -\<*Mrp@@(|m1N,;2:M4Ko5BL,>MTc>xu}V?:??$,5)w]>ZMIt^"DF"NZVFA+!t7x>AO`I X-Hue: white X-Attribution: GM In-Reply-To: (Frederic Pouyet's message of "Fri, 24 May 2013 09:33:40 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:74534 Archived-At: --=-=-= As a general rule, we at bug-gnu-emacs don't support third-party libraries. The code looks pretty crufty, but the attached minimal patch might get it working again for you. If you have any further problems with it, someone on the help-gnu-emacs@gnu.org list might be willing to help. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=specman.diff *** specman-modev122.el.ORIG 2013-05-24 11:03:30.988169064 -0700 --- specman-modev122.el 2013-05-24 11:18:26.382601795 -0700 *************** *** 65,70 **** --- 65,72 ---- ;; specman-mode is a major mode for editing code written in the 'e' language ;; + (require 'cl) + (defconst specman-mode-version "$$Revision: 1.22 $$" "Version of this Specman mode.") *************** *** 137,154 **** (defmacro customize (&rest args) (message "Sorry, Customize is not available with this version of emacs")) (defmacro defcustom (var value doc &rest args) ! (` (defvar (, var) (, value) (, doc)))) ) (if (fboundp 'defface) nil ;; great! (defmacro defface (var value doc &rest args) ! (` (make-face (, var)))) ) (if (and (featurep 'custom) (fboundp 'customize-group)) nil ;; We've got what we needed ;; We have an intermediate custom-library, hack around it! (defmacro customize-group (var &rest args) ! (`(customize (, var) ))) ) (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) nil ;; We've got what we needed --- 139,156 ---- (defmacro customize (&rest args) (message "Sorry, Customize is not available with this version of emacs")) (defmacro defcustom (var value doc &rest args) ! `(defvar ,var ,value , doc)) ) (if (fboundp 'defface) nil ;; great! (defmacro defface (var value doc &rest args) ! `(make-face ,var)) ) (if (and (featurep 'custom) (fboundp 'customize-group)) nil ;; We've got what we needed ;; We have an intermediate custom-library, hack around it! (defmacro customize-group (var &rest args) ! `(customize ,var) ) ) (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) nil ;; We've got what we needed *************** *** 157,170 **** (defmacro customize (&rest args) (message "Sorry, Customize is not available with this version of emacs")) (defmacro defcustom (var value doc &rest args) ! (` (defvar (, var) (, value) (, doc)))) ) (if (and (featurep 'custom) (fboundp 'customize-group)) nil ;; We've got what we needed ;; We have an intermediate custom-library, hack around it! (defmacro customize-group (var &rest args) ! (`(customize (, var) ))) ) (condition-case nil (require 'easymenu) --- 159,172 ---- (defmacro customize (&rest args) (message "Sorry, Customize is not available with this version of emacs")) (defmacro defcustom (var value doc &rest args) ! `(defvar ,var ,value ,doc)) ) (if (and (featurep 'custom) (fboundp 'customize-group)) nil ;; We've got what we needed ;; We have an intermediate custom-library, hack around it! (defmacro customize-group (var &rest args) ! `(customize ,var)) ) (condition-case nil (require 'easymenu) *************** *** 407,419 **** "cover[ \t\n]+\\([A-Za-z0-9_]+\\)[ \t\n]+is" "Regexp that identifies cover definitions (arg 1)") (defconst specman-symbol-begin-regexp "\\<" "Regexp that identifies the beginning of a symbol") (defconst specman-symbol-end-regexp "\\>" ! "Regexp that identifies the end of a symbol") (defconst specman-number-regexp (concat --- 409,422 ---- "cover[ \t\n]+\\([A-Za-z0-9_]+\\)[ \t\n]+is" "Regexp that identifies cover definitions (arg 1)") + (eval-and-compile (defconst specman-symbol-begin-regexp "\\<" "Regexp that identifies the beginning of a symbol") (defconst specman-symbol-end-regexp "\\>" ! "Regexp that identifies the end of a symbol")) (defconst specman-number-regexp (concat *************** *** 748,754 **** :paren-parent nil)) scope-index) ! (when (re-search-forward "^<'" buffer-end nil) (while (and (< (point) buffer-end) (re-search-forward search-regexp buffer-end 'move)) --- 751,757 ---- :paren-parent nil)) scope-index) ! (when (re-search-forward "^<'" buffer-end t) (while (and (< (point) buffer-end) (re-search-forward search-regexp buffer-end 'move)) *************** *** 3135,3141 **** ;;; Hacks for FSF (require 'font-lock) ! (defvar specman-need-fld 1) (defvar font-lock-defaults-alist nil) ;In case we are XEmacs (if specman-need-fld (let ((specman-mode-defaults --- 3138,3144 ---- ;;; Hacks for FSF (require 'font-lock) ! (defvar specman-need-fld nil) (defvar font-lock-defaults-alist nil) ;In case we are XEmacs (if specman-need-fld (let ((specman-mode-defaults *************** *** 3205,3210 **** --- 3208,3216 ---- (make-local-variable 'indent-line-function) (setq indent-line-function 'specman-indent-line) + (set (make-local-variable 'font-lock-defaults) + (get 'specman-mode 'font-lock-defaults)) + (make-local-variable 'comment-start) (make-local-variable 'comment-end) (make-local-variable 'block-comment-start) *************** *** 3448,3454 **** (goto-char lim) (if (equal (point) ;; enter the scope (point-min)) ! (re-search-forward "^<'") (forward-char 1)) (specman-forward-ws) (forward-to-indentation 0) --- 3454,3460 ---- (goto-char lim) (if (equal (point) ;; enter the scope (point-min)) ! (re-search-forward "^<'" nil t) (forward-char 1)) (specman-forward-ws) (forward-to-indentation 0) *************** *** 5371,5377 **** ;; ============================================================================= ;; Require package filladapt ! (require 'filladapt) (add-hook 'specman-mode-hook '(lambda () (auto-fill-mode 1))) --- 5377,5383 ---- ;; ============================================================================= ;; Require package filladapt ! (when (require 'filladapt nil t) (add-hook 'specman-mode-hook '(lambda () (auto-fill-mode 1))) *************** *** 5384,5390 **** ; C++ style comments are already recognized. (setcar filladapt-token-table '("---*" e-comment)) (setcar filladapt-token-match-table '(e-comment e-comment)) ! (setcar filladapt-token-conversion-table '(e-comment . exact)) --- 5390,5396 ---- ; C++ style comments are already recognized. (setcar filladapt-token-table '("---*" e-comment)) (setcar filladapt-token-match-table '(e-comment e-comment)) ! (setcar filladapt-token-conversion-table '(e-comment . exact))) --=-=-=--