HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix doc strings of version-* functions and variables.
[bpt/emacs.git]
/
lisp
/
ledit.el
diff --git
a/lisp/ledit.el
b/lisp/ledit.el
index
fa78925
..
4b7b498
100644
(file)
--- a/
lisp/ledit.el
+++ b/
lisp/ledit.el
@@
-1,16
+1,17
@@
;;; ledit.el --- Emacs side of ledit interface
;;; ledit.el --- Emacs side of ledit interface
-;; Copyright (C) 1985 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Maintainer: FSF
-;; Key
ord
: languages
+;; Key
words
: languages
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software
;
you can redistribute it and/or modify
+;; GNU Emacs is free software
:
you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation
; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation
, either version 3 of the License, or
+;;
(at your option)
any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-18,8
+19,11
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; This is a major mode for editing Liszt. See etc/LEDIT for details.
;;; Code:
;;; Code:
@@
-28,12
+32,14
@@
(defvar ledit-mode-map nil)
(defvar ledit-mode-map nil)
-(defconst ledit-zap-file (concat "/tmp/" (user-login-name) ".l1")
+(defconst ledit-zap-file
+ (expand-file-name (concat (user-login-name) ".l1") temporary-file-directory)
"File name for data sent to Lisp by Ledit.")
"File name for data sent to Lisp by Ledit.")
-(defconst ledit-read-file (concat "/tmp/" (user-login-name) ".l2")
+(defconst ledit-read-file
+ (expand-file-name (concat (user-login-name) ".l2") temporary-file-directory)
"File name for data sent to Ledit by Lisp.")
"File name for data sent to Ledit by Lisp.")
-(defconst ledit-compile-file
- (
concat "/tmp/" (user-login-name) ".l4"
)
+(defconst ledit-compile-file
+ (
expand-file-name (concat (user-login-name) ".l4") temporary-file-directory
)
"File name for data sent to Lisp compiler by Ledit.")
(defconst ledit-buffer "*LEDIT*"
"Name of buffer in which Ledit accumulates data to send to Lisp.")
"File name for data sent to Lisp compiler by Ledit.")
(defconst ledit-buffer "*LEDIT*"
"Name of buffer in which Ledit accumulates data to send to Lisp.")
@@
-49,7
+55,7
@@
*Shell commands to execute to resume Lisp compiler job.")
(defun ledit-save-defun ()
*Shell commands to execute to resume Lisp compiler job.")
(defun ledit-save-defun ()
- "Save the current defun in the ledit buffer"
+ "Save the current defun in the ledit buffer
.
"
(interactive)
(save-excursion
(end-of-defun)
(interactive)
(save-excursion
(end-of-defun)
@@
-88,11
+94,10
@@
(if ledit-save-files
(save-some-buffers))
(if (get-buffer ledit-buffer)
(if ledit-save-files
(save-some-buffers))
(if (get-buffer ledit-buffer)
- (save-excursion
- (set-buffer ledit-buffer)
- (goto-char (point-min))
- (write-region (point-min) (point-max) ledit-zap-file)
- (erase-buffer)))
+ (with-current-buffer ledit-buffer
+ (goto-char (point-min))
+ (write-region (point-min) (point-max) ledit-zap-file)
+ (erase-buffer)))
(suspend-emacs ledit-go-to-lisp-string)
(load ledit-read-file t t))
(suspend-emacs ledit-go-to-lisp-string)
(load ledit-read-file t t))
@@
-102,20
+107,19
@@
(if ledit-save-files
(save-some-buffers))
(if (get-buffer ledit-buffer)
(if ledit-save-files
(save-some-buffers))
(if (get-buffer ledit-buffer)
- (save-excursion
- (set-buffer ledit-buffer)
- (goto-char (point-min))
- (insert "(declare (macros t))\n")
- (write-region (point-min) (point-max) ledit-compile-file)
- (erase-buffer)))
+ (with-current-buffer ledit-buffer
+ (goto-char (point-min))
+ (insert "(declare (macros t))\n")
+ (write-region (point-min) (point-max) ledit-compile-file)
+ (erase-buffer)))
(suspend-emacs ledit-go-to-liszt-string)
(load ledit-read-file t t))
(defun ledit-setup ()
"Set up key bindings for the Lisp/Emacs interface."
(suspend-emacs ledit-go-to-liszt-string)
(load ledit-read-file t t))
(defun ledit-setup ()
"Set up key bindings for the Lisp/Emacs interface."
- (
if (not ledit-mode-map)
- (progn (setq ledit-mode-map (nconc (make-sparse-keymap)
-
shared-lisp-mode-map))
))
+ (
unless ledit-mode-map
+ (setq ledit-mode-map (make-sparse-keymap))
+
(set-keymap-parent ledit-mode-map lisp-mode-shared-map
))
(define-key ledit-mode-map "\e\^d" 'ledit-save-defun)
(define-key ledit-mode-map "\e\^r" 'ledit-save-region)
(define-key ledit-mode-map "\^xz" 'ledit-go-to-lisp)
(define-key ledit-mode-map "\e\^d" 'ledit-save-defun)
(define-key ledit-mode-map "\e\^r" 'ledit-save-region)
(define-key ledit-mode-map "\^xz" 'ledit-go-to-lisp)
@@
-133,11
+137,12
@@
Like Lisp mode, plus these special commands:
\\[ledit-go-to-lisp] -- transfer to Lisp job and transmit saved text.
\\[ledit-go-to-liszt] -- transfer to Liszt (Lisp compiler) job
and transmit saved text.
\\[ledit-go-to-lisp] -- transfer to Lisp job and transmit saved text.
\\[ledit-go-to-liszt] -- transfer to Liszt (Lisp compiler) job
and transmit saved text.
+
\\{ledit-mode-map}
To make Lisp mode automatically change to Ledit mode,
do (setq lisp-mode-hook 'ledit-from-lisp-mode)"
(interactive)
\\{ledit-mode-map}
To make Lisp mode automatically change to Ledit mode,
do (setq lisp-mode-hook 'ledit-from-lisp-mode)"
(interactive)
- (
lisp-mode
)
+ (
delay-mode-hooks (lisp-mode)
)
(ledit-from-lisp-mode))
;;;###autoload
(ledit-from-lisp-mode))
;;;###autoload
@@
-145,6
+150,9
@@
do (setq lisp-mode-hook 'ledit-from-lisp-mode)"
(use-local-map ledit-mode-map)
(setq mode-name "Ledit")
(setq major-mode 'ledit-mode)
(use-local-map ledit-mode-map)
(setq mode-name "Ledit")
(setq major-mode 'ledit-mode)
- (run-hooks 'ledit-mode-hook))
+ (run-mode-hooks 'ledit-mode-hook))
+
+(provide 'ledit)
+;; arch-tag: f0f1ca13-8d31-478c-ae1b-b448c55a8faf
;;; ledit.el ends here
;;; ledit.el ends here