diff options
| author | Stefan Kangas <stefan@marxist.se> | 2021-12-02 17:34:10 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefan@marxist.se> | 2021-12-02 17:34:10 +0100 |
| commit | fa2e812894b999eba8afc4b146ca5e70fa9bd1c8 (patch) | |
| tree | 09f2fb89ba08231529883f111236212078eaa28b /lisp | |
| parent | a97fce7a894f1d5848842a7c37684d01eff48deb (diff) | |
| parent | aa1d7dd867c7d4e06f1b0d3172adc095f3f19643 (diff) | |
| download | emacs-fa2e812894b999eba8afc4b146ca5e70fa9bd1c8.tar.gz emacs-fa2e812894b999eba8afc4b146ca5e70fa9bd1c8.tar.bz2 emacs-fa2e812894b999eba8afc4b146ca5e70fa9bd1c8.zip | |
Merge from origin/emacs-28
aa1d7dd867 ; * etc/AUTHORS: Update.
6294e60205 ; * admin/authors.el (authors-aliases): More fixes.
40fc31ea28 ; * ChangeLog.3: Update.
2be090d5d3 ; * ChangeLog.3: Minor fixes.
9963b11bf7 ; * admin/authors.el (authors-aliases): Further updates.
50b40e1d4f ; * lisp/org/ob-julia.el: Fix Author header for authors.el.
84166ea2e6 CC Mode: Recognise "struct foo {" as introducing a type de...
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/org/ob-julia.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/org/ob-julia.el b/lisp/org/ob-julia.el index 4fae0d142b2..3176baf3702 100644 --- a/lisp/org/ob-julia.el +++ b/lisp/org/ob-julia.el @@ -1,7 +1,7 @@ ;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2021 Free Software Foundation, Inc. -;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison +;; Authors: G. Jay Kerns ;; Maintainer: Pedro Bruel <pedro.bruel@gmail.com> ;; Keywords: literate programming, reproducible research, scientific computing ;; Homepage: https://github.com/phrb/ob-julia @@ -24,6 +24,8 @@ ;;; Commentary: ;; Org-Babel support for evaluating julia code +;; +;; Based on ob-R.el by Eric Schulte and Dan Davison. ;;; Code: (require 'cl-lib) diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index c7b01de9b98..d37a50997ad 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -10009,7 +10009,12 @@ This function might do hidden buffer changes." (save-excursion (goto-char type-start) (let ((c-promote-possible-types t)) - (c-forward-type))))) + (c-forward-type)))) + + ;; Signal a type declaration for "struct foo {". + (when (and backup-at-type-decl + (eq (char-after) ?{)) + (setq at-type-decl t))) (setq backup-at-type at-type backup-type-start type-start |