commit/XEmacs: Vin Shelton: Remove un-needed include of process.h in sysproc.h under cygwin.
12 years, 10 months
Bitbucket
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/changeset/611a6845ebee/
changeset: 611a6845ebee
user: Vin Shelton
date: 2012-02-13 14:00:23
summary: Remove un-needed include of process.h in sysproc.h under cygwin.
affected #: 2 files
diff -r 5bda701e9e7c0dff05fa01010e151be8e0c0dd10 -r 611a6845ebeeecf74cb6f56bb15a1115e76affa9 src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
＠＠ -1,3 +1,10 ＠＠
+2012-02-12 Vin Shelton <acs(a)xemacs.org>
+
+ * sysproc.h: As of Cygwin 1.7.10, /usr/include/process.h has moved
+ to /usr/include/cygwin/process.h, so sysproc.h could no longer
+ find it. It wasn't needed anyway, so remove the include under
+ cygwin.
+
2012-01-08 Aidan Kehoe <kehoea(a)parhasard.net>
* device-x.c:
diff -r 5bda701e9e7c0dff05fa01010e151be8e0c0dd10 -r 611a6845ebeeecf74cb6f56bb15a1115e76affa9 src/sysproc.h
--- a/src/sysproc.h
+++ b/src/sysproc.h
＠＠ -30,8 +30,6 ＠＠
#ifdef MINGW
#include <../mingw/process.h>
-#elif defined (CYGWIN)
-#include <../include/process.h>
#elif defined (WIN32_NATIVE)
/* <process.h> should not conflict with "process.h", as per ANSI definition.
This is not true with visual c though. The trick below works with
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit/cc-mode: acm: Fix infinite loop with long macros.
12 years, 10 months
Bitbucket
Bitbucket
1 new commit in cc-mode:
https://bitbucket.org/xemacs/cc-mode/changeset/2e447eef29f0/
changeset: 2e447eef29f0
user: acm
date: 2012-02-12 11:41:28
summary: Fix infinite loop with long macros.
cc-engine.el (c-state-safe-place): Handle macros properly.
affected #: 1 file
diff -r f917eef6504b24cff35af446be970deaa864e217 -r 2e447eef29f0336cc6544f428729a4cdaa33a2b9 cc-engine.el
--- a/cc-engine.el
+++ b/cc-engine.el
＠＠ -2130,7 +2130,7 ＠＠
(widen)
(save-excursion
(let ((c c-state-nonlit-pos-cache)
- pos npos lit macro-beg)
+ pos npos lit macro-beg macro-end)
;; Trim the cache to take account of buffer changes.
(while (and c (> (car c) c-state-nonlit-pos-cache-limit))
(setq c (cdr c)))
＠＠ -2144,28 +2144,29 ＠＠
;; Add an element to `c-state-nonlit-pos-cache' each iteration.
(and
(<= (setq npos (+ pos c-state-nonlit-pos-interval)) here)
+
+ ;; Test for being in a literal.
(progn
(setq lit (car (cddr (c-state-pp-to-literal pos npos))))
- (cond
- ((null lit)
- (setq pos npos)
- t)
- ((<= (cdr lit) here)
- (setq pos (cdr lit))
- t)
- (t
- (setq pos (car lit))
- nil))))
-
- (goto-char pos)
- (when (and (c-beginning-of-macro) (/= (point) pos))
- (setq macro-beg (point))
- (c-syntactic-end-of-macro)
- (or (eobp) (forward-char))
- (setq pos (if (<= (point) here)
- (point)
- macro-beg)))
- (setq c-state-nonlit-pos-cache (cons pos c-state-nonlit-pos-cache)))
+ (or (null lit)
+ (prog1 (<= (cdr lit) here)
+ (setq npos (cdr lit)))))
+
+ ;; Test for being in a macro.
+ (progn
+ (goto-char npos)
+ (setq macro-beg
+ (and (c-beginning-of-macro) (/= (point) npos) (point)))
+ (when macro-beg
+ (c-syntactic-end-of-macro)
+ (or (eobp) (forward-char))
+ (setq macro-end (point)))
+ (or (null macro-beg)
+ (prog1 (<= macro-end here)
+ (setq npos macro-end)))))
+
+ (setq pos npos)
+ (setq c-state-nonlit-pos-cache (cons pos c-state-nonlit-pos-cache)))
(if (> pos c-state-nonlit-pos-cache-limit)
(setq c-state-nonlit-pos-cache-limit pos))
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit/cc-mode: 2 new changesets
12 years, 10 months
Bitbucket
Bitbucket
2 new commits in cc-mode:
https://bitbucket.org/xemacs/cc-mode/changeset/c98d6d264693/
changeset: c98d6d264693
user: Norbert Koch
date: 2012-02-09 10:06:00
summary: XEmacs Package Release 1.50
affected #: 2 files
diff -r 556124dcf11ce46f5797811412bad750aa66bbce -r c98d6d26469325e40ca583a4405d121fa0d44ca8 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,7 ＠＠
+2012-02-09 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.50 released.
+
2012-01-19 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.49 released.
diff -r 556124dcf11ce46f5797811412bad750aa66bbce -r c98d6d26469325e40ca583a4405d121fa0d44ca8 Makefile
--- a/Makefile
+++ b/Makefile
＠＠ -17,7 +17,7 ＠＠
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.49
+VERSION = 1.50
AUTHOR_VERSION = 5.32.2
MAINTAINER = Alan Mackenzie <bug-cc-mode(a)gnu.org>
PACKAGE = cc-mode
https://bitbucket.org/xemacs/cc-mode/changeset/f917eef6504b/
changeset: f917eef6504b
user: Norbert Koch
date: 2012-02-09 10:06:00
summary: Added tag cc-mode-1_50 for changeset c98d6d264693
affected #: 1 file
diff -r c98d6d26469325e40ca583a4405d121fa0d44ca8 -r f917eef6504b24cff35af446be970deaa864e217 .hgtags
--- a/.hgtags
+++ b/.hgtags
＠＠ -82,3 +82,4 ＠＠
1af191b522b555f4f3c03e9a2bbb06475927ddef cc-mode-1_47
d9e2f6a5fc7f15598c443cc92ff7593d4a4caa18 cc-mode-1_48
965402f1148652d2f746460a4886d3089a160d94 cc-mode-1_49
+c98d6d26469325e40ca583a4405d121fa0d44ca8 cc-mode-1_50
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit/cc-mode: acm: Fix spurious recognition of c-in-knr-argdecl.
12 years, 10 months
Bitbucket
Bitbucket
1 new commit in cc-mode:
https://bitbucket.org/xemacs/cc-mode/changeset/556124dcf11c/
changeset: 556124dcf11c
user: acm
date: 2012-02-07 16:01:05
summary: Fix spurious recognition of c-in-knr-argdecl.
cc-engine.el (c-in-knr-argdecl): Check for '=' in a putative K&R region.
affected #: 1 file
diff -r e770c8edaf094658914a4647238e8069089d4b0f -r 556124dcf11ce46f5797811412bad750aa66bbce cc-engine.el
--- a/cc-engine.el
+++ b/cc-engine.el
＠＠ -7622,14 +7622,17 ＠＠
(save-restriction
;; If we're in a macro, our search range is restricted to it. Narrow to
;; the searchable range.
- (let* ((macro-start (c-query-macro-start))
- (lim (max (or lim (point-min)) (or macro-start (point-min))))
+ (let* ((macro-start (save-excursion (and (c-beginning-of-macro) (point))))
+ (macro-end (save-excursion (and macro-start (c-end-of-macro) (point))))
+ (low-lim (max (or lim (point-min)) (or macro-start (point-min))))
before-lparen after-rparen
- (pp-count-out 20)) ; Max number of paren/brace constructs before we give up
- (narrow-to-region lim (c-point 'eol))
+ (pp-count-out 20)) ; Max number of paren/brace constructs before
+ ; we give up
+ (narrow-to-region low-lim (or macro-end (point-max)))
;; Search backwards for the defun's argument list. We give up if we
- ;; encounter a "}" (end of a previous defun) or BOB.
+ ;; encounter a "}" (end of a previous defun) an "=" (which can't be in
+ ;; a knr region) or BOB.
;;
;; The criterion for a paren structure being the arg list is:
;; o - there is non-WS stuff after it but before any "{"; AND
＠＠ -7649,12 +7652,13 ＠＠
(catch 'knr
(while (> pp-count-out 0) ; go back one paren/bracket pair each time.
(setq pp-count-out (1- pp-count-out))
- (c-syntactic-skip-backward "^)]}")
+ (c-syntactic-skip-backward "^)]}=")
(cond ((eq (char-before) ?\))
(setq after-rparen (point)))
((eq (char-before) ?\])
(setq after-rparen nil))
- (t ; either } (hit previous defun) or no more parens/brackets
+ (t ; either } (hit previous defun) or = or no more
+ ; parens/brackets.
(throw 'knr nil)))
(if after-rparen
＠＠ -7670,18 +7674,18 ＠＠
;; It can't be the arg list if next token is ; or {
(progn (goto-char after-rparen)
(c-forward-syntactic-ws)
- (not (memq (char-after) '(?\; ?\{))))
+ (not (memq (char-after) '(?\; ?\{ ?\=))))
;; Is the thing preceding the list an identifier (the
;; function name), or a macro expansion?
(progn
(goto-char before-lparen)
(eq (c-backward-token-2) 0)
- (or (c-on-identifier)
+ (or (eq (c-on-identifier) (point))
(and (eq (char-after) ?\))
(c-go-up-list-backward)
(eq (c-backward-token-2) 0)
- (c-on-identifier))))
+ (eq (c-on-identifier) (point)))))
;; Have we got a non-empty list of comma-separated
;; identifiers?
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments
commit/cc-mode: acm: cc-engine.el (c-forward-objc-directive): Prevent looping in "#pragma mark
12 years, 10 months
Bitbucket
Bitbucket
1 new commit in cc-mode:
https://bitbucket.org/xemacs/cc-mode/changeset/e770c8edaf09/
changeset: e770c8edaf09
user: acm
date: 2012-02-07 12:37:40
summary: cc-engine.el (c-forward-objc-directive): Prevent looping in "#pragma mark
＠implementation".
affected #: 1 file
diff -r 342dcd485019a39b4da093a047e0d9f9f9ae6a67 -r e770c8edaf094658914a4647238e8069089d4b0f cc-engine.el
--- a/cc-engine.el
+++ b/cc-engine.el
＠＠ -7426,6 +7426,7 ＠＠
(let ((start (point))
start-char
(c-promote-possible-types t)
+ lim
;; Turn off recognition of angle bracket arglists while parsing
;; types here since the protocol reference list might then be
;; considered part of the preceding name or superclass-name.
＠＠ -7453,6 +7454,7 ＠＠
; (c-forward-token-2) ; 2006/1/13 This doesn't move if the token's
; at EOB.
(goto-char (match-end 0))
+ (setq lim (point))
(c-skip-ws-forward)
(c-forward-type))
＠＠ -7477,7 +7479,7 ＠＠
t))))
(progn
- (c-backward-syntactic-ws)
+ (c-backward-syntactic-ws lim)
(c-clear-c-type-property start (1- (point)) 'c-decl-end)
(c-put-c-type-property (1- (point)) 'c-decl-end)
t)
Repository URL: https://bitbucket.org/xemacs/cc-mode/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
- 1 participants
- 0 comments