diff options
| author | hauke <hauke@pkgsrc.org> | 2015-09-30 10:11:45 +0000 |
|---|---|---|
| committer | hauke <hauke@pkgsrc.org> | 2015-09-30 10:11:45 +0000 |
| commit | 1cfe67d2624df5401e898d8fc5aa39b847162789 (patch) | |
| tree | 660bfda19c28b683b46f5519f6cd4f53f1e04265 /editors/xemacs-packages/patches | |
| parent | 1b1455a3cbe0a4ed70b953c7279843aed13140bf (diff) | |
| download | pkgsrc-1cfe67d2624df5401e898d8fc5aa39b847162789.tar.gz | |
Bring xemacs-packages into the 21st century.
o Update packages
o Use DESTDIR features for installing, getting rid of the need to be
root and gaining the ability to patch elisp files in the process.
o Add a mechanism to re-byte-compile the patched elisp files, and
patches to deal with non-utf-8 XEmacsen.
o Grab maintainership
Tested with both 21.4 and 21.5 packages.
Diffstat (limited to 'editors/xemacs-packages/patches')
| -rw-r--r-- | editors/xemacs-packages/patches/patch-lisp_vc_vc-git.el | 28 | ||||
| -rw-r--r-- | editors/xemacs-packages/patches/patch-lisp_vc_vc.el | 21 |
2 files changed, 49 insertions, 0 deletions
diff --git a/editors/xemacs-packages/patches/patch-lisp_vc_vc-git.el b/editors/xemacs-packages/patches/patch-lisp_vc_vc-git.el new file mode 100644 index 00000000000..c1c0160665c --- /dev/null +++ b/editors/xemacs-packages/patches/patch-lisp_vc_vc-git.el @@ -0,0 +1,28 @@ +$NetBSD: patch-lisp_vc_vc-git.el,v 1.1 2015/09/30 10:11:45 hauke Exp $ + +Instead of blindly assuming a utf-8 capable XEmacs, look at the +current buffer for the encoding to use. + +--- lisp/vc/vc-git.el.orig 2007-08-23 21:27:53.000000000 +0000 ++++ lisp/vc/vc-git.el +@@ -35,7 +35,19 @@ + + (eval-when-compile (require 'cl)) + +-(defvar git-commits-coding-system 'utf-8 ++(defun vc-git-determine-coding-system () ++ ++ "Return utf-8 om 21.5, or the current buffer's coding on 21,4" ++ ++ (if (and (featurep 'xemacs) ++ (<= emacs-major-version 21) ++ (< emacs-minor-version 5)) ++ (if (boundp 'buffer-file-coding-system) ++ buffer-file-coding-system ++ 'undecided) ++ 'utf-8)) ++ ++(defvar git-commits-coding-system (vc-git-determine-coding-system) + "Default coding system for git commits.") + + (defun vc-git--run-command-string (file &rest args) diff --git a/editors/xemacs-packages/patches/patch-lisp_vc_vc.el b/editors/xemacs-packages/patches/patch-lisp_vc_vc.el new file mode 100644 index 00000000000..b234f7c3c76 --- /dev/null +++ b/editors/xemacs-packages/patches/patch-lisp_vc_vc.el @@ -0,0 +1,21 @@ +$NetBSD: patch-lisp_vc_vc.el,v 1.1 2015/09/30 10:11:45 hauke Exp $ + +Work around '(error/warning) Error in process sentinel: (error Marker +does not point anywhere)' which shadows the buffer worked on, see +<http://xemacs-beta.xemacs.narkive.com/khCckwa3/package-maintainers-heads-up> + +Supposedly fixed upstream, whereever that is these days, see +<http://tracker.xemacs.org/XEmacs/its/issue682> + +--- lisp/vc/vc.el.orig 2009-12-28 19:51:30.000000000 +0000 ++++ lisp/vc/vc.el +@@ -959,7 +959,8 @@ Else, add CODE to the process' sentinel. + (set-process-sentinel proc + `(lambda (p s) + (with-current-buffer ',(current-buffer) +- (goto-char (process-mark p)) ++ ;;(goto-char (process-mark p)) ++ (ignore-errors (goto-char (process-mark p))) + ,@(append (cdr (cdr (cdr ;strip off `with-current-buffer buf + ; (goto-char...)' + (car (cdr (cdr ;strip off `lambda (p s)' |