CVS update by scop packages/xemacs-packages/python-modes, pydoc.el ...
User: scop
Date: 05/12/17 11:03:17
Modified: packages/xemacs-packages/python-modes ChangeLog Makefile
pydoc.el
Log:
Find pydoc_lisp.py out of the box <1134170914.8084.41.camel(a)localhost.localdomain>
Revision Changes Path
1.16 +9 -0 XEmacs/packages/xemacs-packages/python-modes/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/python-modes/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ChangeLog 2004/04/13 08:50:19 1.15
+++ ChangeLog 2005/12/17 10:03:17 1.16
＠＠ -1,3 +1,12 ＠＠
+2005-12-10 Ville Skyttä <scop(a)xemacs.org>
+
+ * pydoc.el (pydoc-initialize): Make python search for
+ pydoc_lisp.py* from the package data dir.
+
+ * Makefile (DATA_FILES): New, add pydoc_lisp.py.
+ (DATA_DEST): New, set to $(PACKAGE).
+ (EXTRA_SOURCES): Remove pydoc_lisp.py.
+
2004-04-13 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.06 released.
1.14 +4 -1 XEmacs/packages/xemacs-packages/python-modes/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/python-modes/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Makefile 2004/04/13 08:50:19 1.13
+++ Makefile 2005/12/17 10:03:17 1.14
＠＠ -27,6 +27,9 ＠＠ CATEGORY = standard
ELCS = pydoc.elc python-mode.elc
-EXTRA_SOURCES = pydoc-el-README pydoc_lisp.py
+EXTRA_SOURCES = pydoc-el-README
+
+DATA_FILES = pydoc_lisp.py
+DATA_DEST = $(PACKAGE)
include ../../XEmacs.rules
1.2 +9 -3 XEmacs/packages/xemacs-packages/python-modes/pydoc.el
Index: pydoc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/python-modes/pydoc.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pydoc.el 2002/09/18 06:04:19 1.1
+++ pydoc.el 2005/12/17 10:03:17 1.2
＠＠ -383,18 +383,24 ＠＠ Assumes caller has checked that `dialog-
(defun pydoc-initialize()
(message "Please wait a moment while the Python help system is
initialized...")
- (let (output-buf)
+ ;; XEmacs change: help python find pydoc_lisp.py OOTB.
+ (let ((output-buf)
+ (pydir (locate-data-directory "python-modes")))
(save-window-excursion
;; Start a Python interpreter if not already running.
(py-shell)
(pydoc-wait-for-output (current-buffer) 3.0)
(setq output-buf
(py-execute-string
- "if not vars().has_key('pydoc_lisp'):
+ (format
+ "if not vars().has_key('pydoc_lisp'):
+ import sys
+ if not '%s' in sys.path:
+ sys.path.append('%s')
import pydoc_lisp
pydoc_lisp.pydoc_output_lisp()
-"))
+" pydir pydir)))
;; current vintages of python-mode.el (4.6 at least)
;; no longer return a buffer [name]. We get t from the
;; final kill-buffer instead. If we see t we use the