rpm/emacs
SHA256
1
0
Fork 0
forked from pool/emacs
Code Pull Requests Activity
ce1b53cb3a
emacs/emacs-24.1.dif
Dr. Werner Fink 95d0dbb2d2 . 
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=81
2012-06-28 09:17:09 +00:00

876 lines
34 KiB
Plaintext
Raw Blame History

--- Makefile.in
+++ Makefile.in 2012-06-27 09:55:19.212009937 +0000
@@ -127,7 +127,7 @@ libexecdir=@libexecdir@
# (and they contain cross-references that expect them to be there).
mandir=@mandir@
man1dir=$(mandir)/man1
-MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \
+MAN_PAGES=ebrowse.1 emacs.1 emacsclient.1 gnuctags.1 \
grep-changelog.1 rcs-checkin.1
# Where to install and expect the info files describing Emacs. In the
@@ -472,10 +472,8 @@ install-arch-dep: mkdir
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP})
- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACSFULL)
- -chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL)
- rm -f $(DESTDIR)${bindir}/$(EMACS)
- -ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS)
+ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $(DESTDIR)${bindir}/$(EMACS)
+ -chmod 1755 $(DESTDIR)${bindir}/$(EMACS)
if test "${ns_appresdir}" != ""; then \
( cd ${ns_appresdir} ; \
if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
@@ -649,6 +647,7 @@ install-arch-indep: mkdir info install-e
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
thisdir=`/bin/pwd`; \
cd ${mansrcdir}; \
+ cp ctags.1 gnuctags.1; \
for page in ${MAN_PAGES}; do \
(cd $${thisdir}; \
${INSTALL_DATA} ${mansrcdir}/$${page} $(DESTDIR)${man1dir}/$${page}; \
@@ -743,7 +742,7 @@ uninstall:
ext=.gz; else ext=; fi; \
cd $(DESTDIR)${man1dir} && for page in ${MAN_PAGES}; do \
rm -f $$page$$ext; done )
- (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS))
+ (cd $(DESTDIR)${bindir} && rm -f $(EMACS))
(cd $(DESTDIR)${icondir} && rm -f hicolor/*x*/apps/emacs.png hicolor/*x*/apps/emacs22.png hicolor/scalable/apps/emacs.svg hicolor/scalable/mimetypes/emacs-document.svg )
-rm -f $(DESTDIR)${desktopdir}/emacs.desktop
for file in snake-scores tetris-scores; do \
--- configure.in
+++ configure.in 2012-06-27 09:58:47.056118544 +0000
@@ -1438,9 +1438,9 @@ LD_SWITCH_X_SITE_AUX=
LD_SWITCH_X_SITE_AUX_RPATH=
if test "${x_libraries}" != NONE; then
if test -n "${x_libraries}"; then
- LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
- LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
- LD_SWITCH_X_SITE_AUX_RPATH=`echo ${LD_SWITCH_X_SITE_AUX} | sed -e 's/-R/-Wl,-rpath,/'`
+ LD_SWITCH_X_SITE="-L ${x_libraries%%:*}"
+ LD_SWITCH_X_SITE_AUX="-rpath-link ${x_libraries%%:*}"
+ LD_SWITCH_X_SITE_AUX_RPATH="-Wl,-rpath-link ${x_libraries%%:*}"
fi
x_default_search_path=""
x_search_path=${x_libraries}
--- doc/man/etags.1
+++ doc/man/etags.1 2009-08-11 12:59:38.000000000 +0000
@@ -7,7 +7,7 @@
..
.SH NAME
-etags, ctags \- generate tag file for Emacs, vi
+etags, gnuctags \- generate tag file for Emacs, vi
.SH SYNOPSIS
.hy 0
.na
@@ -24,7 +24,7 @@ etags, ctags \- generate tag file for Em
[\|\-\-help\|] [\|\-\-version\|]
\fIfile\fP .\|.\|.
-\fBctags\fP [\|\-aCdgIRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|]
+\fBgnuctags\fP [\|\-aCdgIRVh\|] [\|\-BtTuvwx\|] [\|\-l \fIlanguage\fP\|]
.if n .br
[\|\-o \fItagfile\fP\|] [\|\-r \fIregexp\fP\|]
[\|\-\-parse\-stdin=\fIfile\fP\|]
@@ -43,7 +43,7 @@ etags, ctags \- generate tag file for Em
The \|\fBetags\fP\| program is used to create a tag table file, in a format
understood by
.BR emacs ( 1 )\c
-\&; the \|\fBctags\fP\| program is used to create a similar table in a
+\&; the \|\fBgnuctags\fP\| program is used to create a similar table in a
format understood by
.BR vi ( 1 )\c
\&. Both forms of the program understand
@@ -53,7 +53,7 @@ PHP, PostScript, Python, Prolog, Scheme
most assembler\-like syntaxes.
Both forms read the files specified on the command line, and write a tag
table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for
-\fBctags\fP) in the current working directory.
+\fBgnuctags\fP) in the current working directory.
Files specified with relative file names will be recorded in the tag
table with file names relative to the directory where the tag table
resides. If the tag table is in /dev or is the standard output,
@@ -69,7 +69,7 @@ parsing of the file names following the
language, overriding guesses based on filename extensions.
.SH OPTIONS
Some options make sense only for the \fBvi\fP style tag files produced
-by ctags;
+by gnuctags;
\fBetags\fP does not recognize them.
The programs accept unambiguous abbreviations for long option names.
.TP
@@ -83,7 +83,7 @@ expression search instructions; the \fB\
the delimiter `\|\fB?\fP\|', to search \fIbackwards\fP through files.
The default is to use the delimiter `\|\fB/\fP\|', to search \fIforwards\fP
through files.
-Only \fBctags\fP accepts this option.
+Only \fBgnuctags\fP accepts this option.
.TP
.B \-\-declarations
In C and derived languages, create tags for function declarations,
@@ -157,7 +157,7 @@ the previous ones. The regexps are of o
where \fItagregexp\fP is used to match the tag. It should not match
useless characters. If the match is such that more characters than
needed are unavoidably matched by \fItagregexp\fP, it may be useful to
-add a \fInameregexp\fP, to narrow down the tag scope. \fBctags\fP
+add a \fInameregexp\fP, to narrow down the tag scope. \fBgnuctags\fP
ignores regexps without a \fInameregexp\fP. The syntax of regexps is
the same as in emacs. The following character escape sequences are
supported: \\a, \\b, \\d, \\e, \\f, \\n, \\r, \\t, \\v, which
@@ -236,15 +236,15 @@ tag entries for other files in place. C
by deleting the existing entries for the given files and then
rewriting the new entries at the end of the tags file. It is often
faster to simply rebuild the entire tag file than to use this.
-Only \fBctags\fP accepts this option.
+Only \fBgnuctags\fP accepts this option.
.TP
.B \-v, \-\-vgrind
Instead of generating a tag file, write index (in \fBvgrind\fP format)
-to standard output. Only \fBctags\fP accepts this option.
+to standard output. Only \fBgnuctags\fP accepts this option.
.TP
.B \-x, \-\-cxref
Instead of generating a tag file, write a cross reference (in
-\fBcxref\fP format) to standard output. Only \fBctags\fP accepts this option.
+\fBcxref\fP format) to standard output. Only \fBgnuctags\fP accepts this option.
.TP
.B \-h, \-H, \-\-help
Print usage information. Followed by one or more \-\-language=LANG
--- leim/Makefile.in
+++ leim/Makefile.in 2012-06-27 10:39:29.320443798 +0000
@@ -220,6 +220,9 @@ leim-list.el: ${SUBDIRS} ${TIT_MISC} cha
MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
+${WORLD}: %.elc: %.el
+ ${RUN-EMACS} -f batch-byte-compile $<
+
install: all
if [ ! -d ${INSTALLDIR} ] ; then \
umask 022; ${srcdir}/../build-aux/install-sh -d ${INSTALLDIR}; \
--- lib-src/Makefile.in
+++ lib-src/Makefile.in 2012-06-27 10:41:38.716510300 +0000
@@ -109,8 +109,8 @@ INSTALL_STRIP =
# ========================== Lists of Files ===========================
# Things that a user might actually run, which should be installed in bindir.
-INSTALLABLES = etags${EXEEXT} ctags${EXEEXT} emacsclient${EXEEXT} \
- ebrowse${EXEEXT}
+INSTALLABLES = emacsclient${EXEEXT} \
+ ebrowse${EXEEXT} gnuctags${EXEEXT}
INSTALLABLE_SCRIPTS = rcs-checkin grep-changelog
STAMP_INST_SCRIPTS = stamp-rcs-checkin stamp-grep-changelog
@@ -327,10 +327,11 @@ ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${
## We depend on etags to assure that parallel makes do not write two
## etags.o files on top of each other.
-ctags${EXEEXT}: etags${EXEEXT}
+gnuctags${EXEEXT}: etags${EXEEXT}
$(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \
-DVERSION="\"${version}\"" ${srcdir}/etags.c \
- $(REGEXPOBJ) $(LOADLIBES) -o ctags
+ $(REGEXPOBJ) $(LOADLIBES) -o gnuctags
+
profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h
$(CC) ${ALL_CFLAGS} ${srcdir}/profile.c $(LOADLIBES) -o profile
--- lib-src/pop.c
+++ lib-src/pop.c 2011-11-28 08:38:56.000000000 +0000
@@ -30,6 +30,7 @@ along with GNU Emacs. If not, see <http
#ifdef MAIL_USE_POP
#include <sys/types.h>
+#include <ctype.h>
#ifdef WINDOWSNT
#include "ntlib.h"
#include <winsock.h>
--- lib-src/vcdiff
+++ lib-src/vcdiff 2009-08-12 13:22:18.000000000 +0000
@@ -76,6 +76,8 @@ esac
rev1= rev2= status=0
+rev1=/tmp/getaXXXXXXXX
+rev2=/tmp/getbXXXXXXXX
trap 'status=2; exit' 1 2 13 15
trap 'rm -f $rev1 $rev2 || status=2; exit $status' 0
@@ -86,14 +88,14 @@ do
case $f in
s.* | */s.*)
if
- rev1=`mktemp /tmp/geta.XXXXXXXX`
+ rev1=`mktemp ${rev1}` || exit 1
sccs get -s -p -k $sid1 "$f" > $rev1 &&
case $sid2 in
'')
workfile=`expr " /$f" : '.*/s.\(.*\)'`
;;
*)
- rev2=`mktemp /tmp/getb.XXXXXXXX`
+ rev2=`mktemp ${rev2}` || exit 1
sccs get -s -p -k $sid2 "$f" > $rev2
workfile=$rev2
esac
--- lisp/cmuscheme.el
+++ lisp/cmuscheme.el 2009-08-12 13:29:47.000000000 +0000
@@ -240,7 +240,8 @@ is run).
(read-string "Run Scheme: " scheme-program-name)
scheme-program-name)))
(if (not (comint-check-proc "*scheme*"))
- (let ((cmdlist (split-string-and-unquote cmd)))
+ (let ((cmdlist (split-string-and-unquote cmd))
+ process-connection-type)
(set-buffer (apply 'make-comint "scheme" (car cmdlist)
(scheme-start-file (car cmdlist)) (cdr cmdlist)))
(inferior-scheme-mode)))
--- lisp/dired.el
+++ lisp/dired.el 2012-06-27 10:43:26.472010441 +0000
@@ -71,7 +71,8 @@ If nil, `dired-listing-switches' is used
(defcustom dired-chown-program
(purecopy (cond ((executable-find "chown") "chown")
((file-executable-p "/usr/sbin/chown") "/usr/sbin/chown")
- ((file-executable-p "/etc/chown") "/etc/chown")
+ ((file-executable-p "/usr/bin/chown") "/usr/bin/chown")
+ ((file-executable-p "/bin/chown") "/bin/chown")
(t "chown")))
"Name of chown command (usually `chown')."
:group 'dired
--- lisp/help.el
+++ lisp/help.el 2012-06-27 10:44:38.572010511 +0000
@@ -45,6 +45,9 @@
(defvar help-window-point-marker (make-marker)
"Marker to override default `window-point' in help windows.")
+(defvar help-mode-hook nil
+ "Normal hook run when entering Help mode.")
+
(defvar help-map
(let ((map (make-sparse-keymap)))
(define-key map (char-to-string help-char) 'help-for-help)
--- lisp/international/mule-cmds.el
+++ lisp/international/mule-cmds.el 2010-10-18 14:06:48.000000000 +0000
@@ -41,6 +41,7 @@
(defvar mule-keymap
(let ((map (make-sparse-keymap)))
+ (define-key map "m" 'toggle-enable-multibyte-characters)
(define-key map "f" 'set-buffer-file-coding-system)
(define-key map "r" 'revert-buffer-with-coding-system)
(define-key map "F" 'set-file-name-coding-system)
--- lisp/mh-e/mh-e.el
+++ lisp/mh-e/mh-e.el 2007-05-21 12:27:40.000000000 +0000
@@ -137,6 +137,9 @@
"/usr/local/mh/"
"/usr/bin/mh/" ; Ultrix 4.2, Linux
"/usr/new/mh/" ; Ultrix < 4.2
+ "/usr/bin/" ; SuSE Linux
+ "/etc/nmh/" ; SuSE Linux
+ "/usr/lib/nmh/" ; SuSE Linux
"/usr/contrib/mh/bin/" ; BSDI
"/usr/pkg/bin/" ; NetBSD
"/usr/local/bin/"
@@ -157,20 +160,20 @@ Use the function `mh-variants' instead."
This differs from `mh-variant' when the latter is set to
\"autodetect\".")
-(defvar mh-progs nil
+(defvar mh-progs "/usr/bin/"
"Directory containing MH commands, such as inc, repl, and rmm.")
;;;###autoload
(put 'mh-progs 'risky-local-variable t)
-(defvar mh-lib nil
+(defvar mh-lib "/etc/nmh/"
"Directory containing the MH library.
This directory contains, among other things, the components file.")
;;;###autoload
(put 'mh-lib 'risky-local-variable t)
-(defvar mh-lib-progs nil
+(defvar mh-lib-progs "/usr/lib/nmh/"
"Directory containing MH helper programs.
This directory contains, among other things, the mhl program.")
--- lisp/net/ange-ftp.el
+++ lisp/net/ange-ftp.el 2009-08-12 13:35:06.000000000 +0000
@@ -4956,7 +4956,7 @@ NEWNAME should be the name to give the n
; "If a host matches this regexp then it is assumed to be running VOS.")
;
;(defun ange-ftp-vos-host (host)
-; (and ange-ftp-vos-host-regexp
+; (and host ange-ftp-vos-host-regexp
; (save-match-data
; (string-match ange-ftp-vos-host-regexp host))))
;
@@ -5071,7 +5071,7 @@ NEWNAME should be the name to give the n
;; Return non-nil if HOST is running VMS.
(defun ange-ftp-vms-host (host)
- (and ange-ftp-vms-host-regexp
+ (and host ange-ftp-vms-host-regexp
(string-match-p ange-ftp-vms-host-regexp host)))
;; Because some VMS ftp servers convert filenames to lower case
@@ -5579,7 +5579,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running MTS.
(defun ange-ftp-mts-host (host)
- (and ange-ftp-mts-host-regexp
+ (and host ange-ftp-mts-host-regexp
(string-match-p ange-ftp-mts-host-regexp host)))
;; Parse the current buffer which is assumed to be in mts ftp dir format.
@@ -5777,7 +5777,7 @@ Other orders of $ and _ seem to all work
;; Return non-nil if HOST is running CMS.
(defun ange-ftp-cms-host (host)
- (and ange-ftp-cms-host-regexp
+ (and host ange-ftp-cms-host-regexp
(string-match-p ange-ftp-cms-host-regexp host)))
(defun ange-ftp-add-cms-host (host)
--- lisp/site-load.el
+++ lisp/site-load.el 2009-08-12 17:19:34.000000000 +0000
@@ -0,0 +1,61 @@
+;;;;
+;;; emacs20.xx/lisp/site-load.el
+;;; Copyright (c) 1995,96,98,99 SuSE Gmbh Nuernberg, Germany. All rights reserved.
+;;;
+;;; Autor: Werner Fink <werner@suse.de>, No warranty of any kind
+;;;;
+;; CONFIGURATION (under bash):
+;; (export CC=gcc; \
+;; export CFLAGS="-O2 $(arch dependent flags) -pipe \
+;; -DSYSTEM_PURESIZE_EXTRA=25000 -DSITELOAD_PURESIZE_EXTRA=10000" ; \
+;; ./configure $(arch)-suse-linux --with-x --with-x-toolkit=lucid \
+;; --with-gcc --with-pop --with-system-malloc --prefix=/usr \
+;; --exec-prefix=/usr \
+;; --x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib )
+;;
+;; include bug fixes you have
+;;
+;; MAKE:
+;; make LDFLAGS=-s CC=gcc CFLAGS="-O2 $(arch dependent flags) -pipe \
+;; -DSYSTEM_PURESIZE_EXTRA=25000 -DSITELOAD_PURESIZE_EXTRA=10000"
+;;
+;; DOC:
+;; lisp/emacs-lisp/backquote.elc lisp/disp-table.elc lisp/delsel.elc
+;; lisp/lpr.elc added to src/Makefile.in for DOCumentation
+;;
+;;;;
+(garbage-collect)
+
+(if (fboundp 'delete-frame)
+ (progn
+ (load "emacs-lisp/backquote"))
+ (garbage-collect))
+
+(load "disp-table")
+(garbage-collect)
+
+(load "lpr")
+(setq lpr-headers-switches (list "-h"))
+(setq lpr-add-switches t)
+(garbage-collect)
+
+;; Scrollbar was always on the `right' side
+(custom-set-variables '(scroll-bar-mode (quote right)))
+(garbage-collect)
+
+;; Highlight marked regions
+(custom-set-variables '(transient-mark-mode 1))
+(custom-set-variables '(mark-even-if-inactive t))
+(garbage-collect)
+
+;; Overwrite `load delsel'
+;; Choose `t' in your ~/.emacs
+(custom-set-variables '(delete-selection-mode nil))
+(garbage-collect)
+
+(setq news-inews-program "/usr/lib/news/inews")
+(setq gnus-default-nntp-server "news")
+(defvar gnus-local-domain nil)
+(garbage-collect)
+
+;;; site-load.el ends here
--- lisp/speedbar.el
+++ lisp/speedbar.el 2012-06-27 11:04:52.701369888 +0000
@@ -802,6 +802,7 @@ If you want to change this while speedba
;; Navigation.
(define-key map "n" 'speedbar-next)
+ (define-key map [tab] 'speedbar-next)
(define-key map "p" 'speedbar-prev)
(define-key map "\M-n" 'speedbar-restricted-next)
(define-key map "\M-p" 'speedbar-restricted-prev)
--- lisp/textmodes/ispell.el
+++ lisp/textmodes/ispell.el 2009-08-12 13:49:26.000000000 +0000
@@ -349,10 +349,13 @@ Must be greater than 1."
:group 'ispell)
(defcustom ispell-program-name
- (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p)
- (locate-file "ispell" exec-path exec-suffixes 'file-executable-p)
- (locate-file "hunspell" exec-path exec-suffixes 'file-executable-p)
- "ispell")
+ (progn
+ (if (and (functionp 'append-ispell-dict-alist))
+ "ispell"
+ (or (locate-file "aspell" exec-path exec-suffixes 'file-executable-p)
+ (locate-file "ispell" exec-path exec-suffixes 'file-executable-p)
+ (locate-file "hunspell" exec-path exec-suffixes 'file-executable-p)
+ "ispell")))
"Program invoked by \\[ispell-word] and \\[ispell-region] commands."
:type 'string
:group 'ispell)
@@ -1156,6 +1159,56 @@ The variable `ispell-library-directory'
(if ispell-menu-map-needed
(progn
(setq ispell-menu-map (make-sparse-keymap "Spell"))
+ ;; Begin adding list for ispell dictonaries installed on SuSE
+ (if (and (functionp 'append-ispell-dict-alist)
+ (symbolp 'ispell-program-name)
+ (string-match "ispell" ispell-program-name))
+ (let ((dicts (reverse (cons (cons "default" nil)
+ (append ispell-local-dictionary-alist ispell-dictionary-alist))))
+ (path (and (boundp 'ispell-library-path) ispell-library-path))
+ name load-dict)
+ (dolist (dict dicts)
+ (setq name (car dict)
+ load-dict (car (cdr (member "-d" (nth 5 dict)))))
+ (cond ((not (stringp name))
+ (define-key ispell-menu-map (vector 'default)
+ (cons "Select Default Dict"
+ (cons "Dictionary for which Ispell was configured"
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary "default"))))))
+ ((or (not path) ; load all if library dir not defined
+ (file-exists-p (concat path "/" name ".hash"))
+ (file-exists-p (concat path "/" name ".has"))
+ (and load-dict
+ (or (file-exists-p(concat path "/" load-dict ".hash"))
+ (file-exists-p(concat path "/" load-dict ".has")))))
+ (define-key ispell-menu-map (vector (intern name))
+ (cons (concat "Select " (capitalize name) " Dict")
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary name))))))))
+ (if (and (functionp 'ispell-find-aspell-dictionaries)
+ (symbolp 'ispell-program-name)
+ (string-match "aspell" ispell-program-name))
+ (progn
+ (ispell-find-aspell-dictionaries)
+ (let ((dicts (reverse (cons (cons "default" nil)
+ (append ispell-local-dictionary-alist ispell-dictionary-alist))))
+ name load-dict)
+ (dolist (dict dicts)
+ (setq name (car dict))
+ (cond ((not (stringp name))
+ (define-key ispell-menu-map (vector 'default)
+ (cons "Select Default Dict"
+ (cons "Dictionary for which Aspell was configured"
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary "default"))))))
+ ((and (stringp name)
+ (ispell-aspell-find-dictionary name))
+ (define-key ispell-menu-map (vector (intern name))
+ (cons (concat "Select " (capitalize name) " Dict")
+ (list 'lambda () '(interactive)
+ (list 'ispell-change-dictionary name)))))))))))
+ ;; End adding list for ispell dictonaries installed on SuSE
(define-key ispell-menu-map [ispell-change-dictionary]
`(menu-item ,(purecopy "Change Dictionary...") ispell-change-dictionary
:help ,(purecopy "Supply explicit dictionary file name")))
--- site-lisp/term/func-keys.el
+++ site-lisp/term/func-keys.el 2003-07-23 16:08:56.000000000 +0000
@@ -0,0 +1,33 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/func-keys.el for site-lisp path
+;;; Copyright (c) 1996-2001 SuSE Gmbh Nuernberg, Germany.
+;;;
+;;; Author: Werner Fink <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; num block
+;; kp_f1 .. kp_f4 and kp_tab not found on MF-102
+ (global-set-key [kp-f1] esc-map) ; Escape
+ (global-set-key [kp-f2] 'undo) ; Undo
+ (global-set-key [kp-f3] 'isearch-forward) ; Search
+ (global-set-key [kp-f4] 'kill-line) ; Kill-Line
+;;
+;; Backspace, Delete and any thing else
+;;
+(if (not window-system)
+ ; Do nothing within terminals because they know about
+ nil
+ (if (fboundp 'normal-erase-is-backspace-mode)
+ (normal-erase-is-backspace-mode 1)
+ (global-set-key [delete] 'delete-char))
+ ;(global-set-key [delete] '[127])
+ ;(global-unset-key [backspace])
+ ;(global-set-key [backspace] '[127])
+)
+;;
+;; Wheel mouse support
+;;
+(if (fboundp 'mouse-wheel-mode)
+ (mouse-wheel-mode 1)
+)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von func-keys.el
--- site-lisp/term/gnome.el
+++ site-lisp/term/gnome.el 2003-07-23 16:08:56.000000000 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/gnomw.el for site-lisp path
+;;; Copyright (c) 2000 SuSE Gmbh Nuernberg, Germany. All rights reserved.
+;;;
+;;; Author: Werner Fink <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; (define-key function-key-map "\e[1~" [find])
+; (define-key function-key-map "\eOH" [home])
+ (define-key function-key-map "\e[1~" [home])
+ (define-key function-key-map "\e[2~" [insertchar])
+ (define-key function-key-map "\e[3~" [deletechar])
+; (define-key function-key-map "\e[4~" [select])
+; (define-key function-key-map "\eOF" [end])
+ (define-key function-key-map "\e[4~" [end])
+ (define-key function-key-map "\e[5~" [prior])
+ (define-key function-key-map "\e[6~" [next])
+ (define-key function-key-map "\e[OP" [f1])
+ (define-key function-key-map "\e[OQ" [f2])
+ (define-key function-key-map "\e[OR" [f3])
+ (define-key function-key-map "\e[OS" [f4])
+ (define-key function-key-map "\e[15~" [f5])
+ (define-key function-key-map "\e[17~" [f6])
+ (define-key function-key-map "\e[18~" [f7])
+ (define-key function-key-map "\e[19~" [f8])
+ (define-key function-key-map "\e[20~" [f9])
+ (define-key function-key-map "\e[21~" [f10])
+ (define-key function-key-map "\e[23~" [f11])
+ (define-key function-key-map "\e[24~" [f12])
+ (define-key function-key-map "\e[25~" [f13])
+ (define-key function-key-map "\e[26~" [f14])
+ (define-key function-key-map "\e[28~" [help])
+ (define-key function-key-map "\e[29~" [menu])
+ (define-key function-key-map "\e?\e[28~" [M-help])
+ (define-key function-key-map "\e?\e[29~" [M-menu])
+ (define-key function-key-map "\e[31~" [f17])
+ (define-key function-key-map "\e[32~" [f18])
+ (define-key function-key-map "\e[33~" [f19])
+ (define-key function-key-map "\e[34~" [f20])
+;;
+;; num block
+;; [home] and [end] found in num block
+; (define-key function-key-map "\eOH" [home])
+; (define-key function-key-map "\eOF" [end])
+ (define-key function-key-map "\e[1~" [home])
+ (define-key function-key-map "\e[4~" [end])
+;;
+;; Locked num block
+ (define-key function-key-map "\eOI" [kp-tab])
+ (define-key function-key-map "\eOj" [kp-multiply])
+ (define-key function-key-map "\eOk" [kp-add])
+ (define-key function-key-map "\eOl" [kp-separator])
+ (define-key function-key-map "\eOM" [kp-enter])
+ (define-key function-key-map "\eOm" [kp-subtract])
+ (define-key function-key-map "\eOn" [kp-decimal])
+; (define-key function-key-map "\eOn" [kp-period]) ; [kp-decimal]
+ (define-key function-key-map "\eOo" [kp-divide])
+ (define-key function-key-map "\eOp" [kp-0])
+ (define-key function-key-map "\eOq" [kp-1])
+ (define-key function-key-map "\eOr" [kp-2])
+ (define-key function-key-map "\eOs" [kp-3])
+ (define-key function-key-map "\eOt" [kp-4])
+ (define-key function-key-map "\eOu" [kp-5])
+ (define-key function-key-map "\eOv" [kp-6])
+ (define-key function-key-map "\eOw" [kp-7])
+ (define-key function-key-map "\eOx" [kp-8])
+ (define-key function-key-map "\eOy" [kp-9])
+;;
+;; Undefine some ESC ESC behavior --- for later use
+ (global-unset-key "\e\e")
+ (define-key esc-map "\e" nil)
+;;
+ (define-key function-key-map "\eOD" [left])
+ (define-key function-key-map "\eOC" [right])
+ (define-key function-key-map "\eOA" [up])
+ (define-key function-key-map "\eOB" [down])
+;;
+ (define-key function-key-map "\e\eOD" [M-left])
+ (define-key function-key-map "\e\eOC" [M-right])
+ (define-key function-key-map "\e\eOA" [M-up])
+ (define-key function-key-map "\e\eOB" [M-down])
+;;
+;; Not in Use?
+ (define-key function-key-map "\C-?\eOD" [C-left])
+ (define-key function-key-map "\C-?\eOC" [C-right])
+ (define-key function-key-map "\C-?\eOA" [C-up])
+ (define-key function-key-map "\C-?\eOB" [C-down])
+;;
+;; Backspace, Delete and any thing else
+;;
+ (global-unset-key [insertchar])
+ (global-set-key [insertchar] 'overwrite-mode)
+ (global-unset-key [deletechar])
+ (global-set-key [deletechar] 'delete-char)
+;;
+(load "term/func-keys" nil t)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von gnomw.el
--- site-lisp/term/kvt.el
+++ site-lisp/term/kvt.el 2003-07-23 16:08:56.000000000 +0000
@@ -0,0 +1,97 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/kvt.el for site-lisp path
+;;; Copyright (c) 2000 SuSE Gmbh Nuernberg, Germany. All rights reserved.
+;;;
+;;; Author: Werner Fink <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ (define-key function-key-map "\e[1~" [find])
+ (define-key function-key-map "\eOH" [home])
+ (define-key function-key-map "\e[2~" [insertchar])
+ (define-key function-key-map "\e[3~" [deletechar])
+ (define-key function-key-map "\e[4~" [select])
+ (define-key function-key-map "\eOF" [end])
+ (define-key function-key-map "\e[5~" [prior])
+ (define-key function-key-map "\e[6~" [next])
+ (define-key function-key-map "\e[11~" [f1])
+ (define-key function-key-map "\e[12~" [f2])
+ (define-key function-key-map "\e[13~" [f3])
+ (define-key function-key-map "\e[14~" [f4])
+ (define-key function-key-map "\e[15~" [f5])
+ (define-key function-key-map "\e[17~" [f6])
+ (define-key function-key-map "\e[18~" [f7])
+ (define-key function-key-map "\e[19~" [f8])
+ (define-key function-key-map "\e[20~" [f9])
+ (define-key function-key-map "\e[21~" [f10])
+ (define-key function-key-map "\e[23~" [f11])
+ (define-key function-key-map "\e[24~" [f12])
+ (define-key function-key-map "\e[25~" [f13])
+ (define-key function-key-map "\e[26~" [f14])
+ (define-key function-key-map "\e[28~" [help])
+ (define-key function-key-map "\e[29~" [menu])
+ (define-key function-key-map "\e?\e[28~" [M-help])
+ (define-key function-key-map "\e?\e[29~" [M-menu])
+ (define-key function-key-map "\e[31~" [f17])
+ (define-key function-key-map "\e[32~" [f18])
+ (define-key function-key-map "\e[33~" [f19])
+ (define-key function-key-map "\e[34~" [f20])
+;;
+;; num block
+;; [home] and [end] found in num block
+ (define-key function-key-map "\eOH" [home])
+ (define-key function-key-map "\eOF" [end])
+;;
+;; Locked num block
+ (define-key function-key-map "\eOP" [kp-f1])
+ (define-key function-key-map "\eOQ" [kp-f2])
+ (define-key function-key-map "\eOR" [kp-f3])
+ (define-key function-key-map "\eOS" [kp-f4])
+ (define-key function-key-map "\eOI" [kp-tab])
+ (define-key function-key-map "\eOj" [kp-multiply])
+ (define-key function-key-map "\eOk" [kp-add])
+ (define-key function-key-map "\eOl" [kp-separator])
+ (define-key function-key-map "\eOM" [kp-enter])
+ (define-key function-key-map "\eOm" [kp-subtract])
+ (define-key function-key-map "\eOn" [kp-decimal])
+; (define-key function-key-map "\eOn" [kp-period]) ; [kp-decimal]
+ (define-key function-key-map "\eOo" [kp-divide])
+ (define-key function-key-map "\eOp" [kp-0])
+ (define-key function-key-map "\eOq" [kp-1])
+ (define-key function-key-map "\eOr" [kp-2])
+ (define-key function-key-map "\eOs" [kp-3])
+ (define-key function-key-map "\eOt" [kp-4])
+ (define-key function-key-map "\eOu" [kp-5])
+ (define-key function-key-map "\eOv" [kp-6])
+ (define-key function-key-map "\eOw" [kp-7])
+ (define-key function-key-map "\eOx" [kp-8])
+ (define-key function-key-map "\eOy" [kp-9])
+;;
+;; Undefine some ESC ESC behavior --- for later use
+ (global-unset-key "\e\e")
+ (define-key esc-map "\e" nil)
+;;
+ (define-key function-key-map "\eOD" [left])
+ (define-key function-key-map "\eOC" [right])
+ (define-key function-key-map "\eOA" [up])
+ (define-key function-key-map "\eOB" [down])
+;;
+ (define-key function-key-map "\e\eOD" [M-left])
+ (define-key function-key-map "\e\eOC" [M-right])
+ (define-key function-key-map "\e\eOA" [M-up])
+ (define-key function-key-map "\e\eOB" [M-down])
+;;
+;; Not in Use?
+ (define-key function-key-map "\C-?\eOD" [C-left])
+ (define-key function-key-map "\C-?\eOC" [C-right])
+ (define-key function-key-map "\C-?\eOA" [C-up])
+ (define-key function-key-map "\C-?\eOB" [C-down])
+;;
+;; Backspace, Delete and any thing else
+;;
+ (global-unset-key [insertchar])
+ (global-set-key [insertchar] 'overwrite-mode)
+ (global-unset-key [deletechar])
+ (global-set-key [deletechar] 'delete-char)
+;;
+(load "term/func-keys" nil t)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von kvt.el
--- site-lisp/term/linux.el
+++ site-lisp/term/linux.el 2003-07-23 16:08:56.000000000 +0000
@@ -0,0 +1,79 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/linux.el for site-lisp path
+;;; Copyright (c) 1996 SuSE Gmbh Nuernberg, Germany. All rights reserved.
+;;;
+;;; Author: Werner Fink <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ (define-key function-key-map "\e[1~" [home])
+ (define-key function-key-map "\e[2~" [insertchar])
+ (define-key function-key-map "\e[3~" [deletechar])
+ (define-key function-key-map "\e[4~" [end])
+ (define-key function-key-map "\e[5~" [prior])
+ (define-key function-key-map "\e[6~" [next])
+ (define-key function-key-map "\e[[A" [f1])
+ (define-key function-key-map "\e[[B" [f2])
+ (define-key function-key-map "\e[[C" [f3])
+ (define-key function-key-map "\e[[D" [f4])
+ (define-key function-key-map "\e[[E" [f5])
+ (define-key function-key-map "\e[17~" [f6])
+ (define-key function-key-map "\e[18~" [f7])
+ (define-key function-key-map "\e[19~" [f8])
+ (define-key function-key-map "\e[20~" [f9])
+ (define-key function-key-map "\e[21~" [f10])
+ (define-key function-key-map "\e[23~" [f11])
+ (define-key function-key-map "\e[24~" [f12])
+ (define-key function-key-map "\e[25~" [f13])
+ (define-key function-key-map "\e[26~" [f14])
+ (define-key function-key-map "\e[28~" [help])
+ (define-key function-key-map "\e[29~" [menu])
+ (define-key function-key-map "\e?\e[28~" [M-help])
+ (define-key function-key-map "\e?\e[29~" [M-menu])
+ (define-key function-key-map "\e[31~" [f17])
+ (define-key function-key-map "\e[32~" [f18])
+ (define-key function-key-map "\e[33~" [f19])
+ (define-key function-key-map "\e[34~" [f20])
+;;
+;; Not in Use?
+;; ----------------------------------
+;; Console-Setting for Linux ???
+ (define-key function-key-map "\e[H" [M-up])
+ (define-key function-key-map "\e[Y" [M-down])
+ (define-key function-key-map "\e[M" [menu])
+ (define-key function-key-map "\e?\e[M" [M-menu])
+ (define-key function-key-map "\e[P" [pause])
+;;
+;; num block
+ (define-key function-key-map "\e[G" [begin])
+;;
+;; Locked num block Nothing to do :-)
+;;
+;; Undefine some ESC ESC behavior --- for later use
+ (global-unset-key "\e\e")
+ (define-key esc-map "\e" nil)
+;;
+ (define-key function-key-map "\e[D" [left])
+ (define-key function-key-map "\e[C" [right])
+ (define-key function-key-map "\e[A" [up])
+ (define-key function-key-map "\e[B" [down])
+;;
+ (define-key function-key-map "\e\e[D" [M-left])
+ (define-key function-key-map "\e\e[C" [M-right])
+ (define-key function-key-map "\e\e[A" [M-up])
+ (define-key function-key-map "\e\e[B" [M-down])
+;;
+;; Not in Use?
+ (define-key function-key-map "\C-?\e[D" [C-left])
+ (define-key function-key-map "\C-?\e[C" [C-right])
+ (define-key function-key-map "\C-?\e[A" [C-up])
+ (define-key function-key-map "\C-?\e[B" [C-down])
+;;
+;; Backspace, Delete and any thing else
+;;
+ (global-unset-key [insertchar])
+ (global-set-key [insertchar] 'overwrite-mode)
+ (global-unset-key [deletechar])
+ (global-set-key [deletechar] 'delete-char)
+;;
+(load "term/func-keys" nil t)
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von linux.el
--- site-lisp/term/locale.el
+++ site-lisp/term/locale.el 2007-06-04 13:26:39.000000000 +0000
@@ -0,0 +1,16 @@
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; term/locale.el for site-lisp path
+;;; Copyright (c) 1996-2003 SuSE Linux AG Nuernberg, Germany.
+;;; Copyright (c) 2007 SuSE LINUX Products GmbH Nuernberg, Germany.
+;;;
+;;; Author: Werner Fink <werner@suse.de>, No warranty of any kind
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(add-hook 'term-setup-hook (function (lambda ()
+ (load "term/func-keys" t t))))
+;; Nowadays
+(if window-system
+ (setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT STRING TEXT)))
+;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Ende von locale.el
--- src/config.in
+++ src/config.in 2012-06-27 11:12:06.416510145 +0000
@@ -1348,6 +1348,8 @@ along with GNU Emacs. If not, see <http
code using `volatile' can become incorrect without. Disable with care. */
#undef volatile
+/* tparam() masking because of common name in ncurses */
+#define tparam emacs_tparam
/* On AIX 3 this must be included before any other include file. */
#include <alloca.h>
--- src/lisp.mk
+++ src/lisp.mk 2012-06-27 11:10:56.532510062 +0000
@@ -142,6 +142,8 @@ lisp = \
$(lispsource)/w32-vars.elc \
$(lispsource)/term/w32-win.elc \
$(lispsource)/ls-lisp.elc \
+ $(lispsource)/lpr.elc \
+ $(lispsource)/delsel.elc \
$(lispsource)/disp-table.elc \
$(lispsource)/dos-w32.elc \
$(lispsource)/w32-fns.elc \
--- src/s/gnu-linux.h
+++ src/s/gnu-linux.h 2012-06-27 11:35:27.128011252 +0000
@@ -169,4 +169,15 @@ along with GNU Emacs. If not, see <http
# define USE_MMAP_FOR_BUFFERS
#endif
+#ifndef HAVE_TERMIOS
+# define HAVE_TERMIOS
+#endif
+/* When _USE_BSD is defined, which it will be on glibc based
+ * systems, sigmask/sigpause will be defined in the system signal.h
+ * header file, we want the one in emacs's syssignal.h or else things
+ * blow up. Note this worked on Intel by luck because of how arguments
+ * are passed on the stack ;-(
+ */
+#undef sigmask
+#undef sigpause
--- src/sysdep.c
+++ src/sysdep.c 2012-06-27 11:36:07.464510261 +0000
@@ -89,6 +89,7 @@ along with GNU Emacs. If not, see <http
#include "dispextern.h"
#include "process.h"
#include "cm.h" /* for reset_sys_modes */
+extern void tputs (const char *, int, int (*)(int));
#ifdef WINDOWSNT
#include <direct.h>
View Git Blame Copy Permalink