Bug: c++ code block automatically adds comma [8.2.10 (release_8.2.10 @ c:/Users/Louis/home/bin/emacs-24.5/share/emacs/24.5/lisp/org/)]

[Louis Strous <louis@quae.nl>]

When I edit a c++ code block using C-c ' and then finish the edit using
C-c ' again, then org-mode sometimes adds a comma to the code.

Start of reproduction scenario:

1. Start emacs using "emacs -Q"

2. Execute "org-mode" to change the *scratch* buffer's major mode to
    org-mode.

3. Add the following text to the buffer:

#+BEGIN_SRC c++
#+END_SRC

4. Put the cursor at the beginning of the #+BEGIN_SRC line and press 
"C-c
    '" to start editing the code block.  The "*Org Src *scratch*[ c++ ]*"
    buffer is displayed.

5. Enter the following c++ code in the "*Org Src *scratch*[ c++ ]*" 
buffer:

if (foo)
   *foo = 3;

6. Note the absence of a comma in front of the "*".  Now press "C-c '"
    again to end editing the code block.  The code block in the *scratch*
    buffer changes to

#+BEGIN_SRC c++
   if (foo)
     ,*foo = 3;
#+END_SRC

    Note the appearance of a comma in front of the "*".

7. Press "C-c '" to edit the code block again.  The code displayed in
    the "*Org Src *scratch*[ c++ ]*" buffer does not contain the comma:

if (foo)
   *foo = 3;

8. Press "C-c '" to finish the editing.  The code in the *scratch*
    buffer still contains the comma.

End of reproduction scenario.

So far I have seen this behavior only when there is a * at the beginning
of the line of code.  I've seen it on three different systems, the one
mentioned below and also

Emacs  : GNU Emacs 25.2.1 (x86_64-w64-mingw32)
  of 2017-04-24
Package: Org-mode version 8.2.10 (release_8.2.10 @ 
d:/Documents/emacs/share/emacs/25.2/lisp/org/)

and

Emacs  : GNU Emacs 25.3.1 (x86_64-redhat-linux-gnu, GTK+ Version 
3.22.19)
  of 2017-09-15
Package: Org-mode version 8.2.10 (release_8.2.10 @ 
/usr/share/emacs/25.3/lisp/org/)

Regards,
Louis Strous

Emacs  : GNU Emacs 24.5.1 (i686-pc-mingw32)
  of 2015-04-11 on LEG570
Package: Org-mode version 8.2.10 (release_8.2.10 @ 
c:/Users/Louis/home/bin/emacs-24.5/share/emacs/24.5/lisp/org/)

current state:
==============
(setq
  org-ctrl-c-ctrl-c-hook '(org-babel-hash-at-point
			  org-babel-execute-safely-maybe)
  org-tab-first-hook '(org-hide-block-toggle-maybe
		      org-src-native-tab-command-maybe
		      org-babel-hide-result-toggle-maybe
		      org-babel-header-arg-expand)
  org-cycle-hook '(org-cycle-hide-archived-subtrees 
org-cycle-hide-drawers
		  org-cycle-hide-inline-tasks org-cycle-show-empty-lines
		  org-optimize-window-after-visibility-change)
  org-agenda-before-write-hook '(org-agenda-add-entry-text)
  org-speed-command-hook '(org-speed-command-default-hook
			  org-babel-speed-command-hook)
  org-babel-pre-tangle-hook '(save-buffer)
  org-occur-hook '(org-first-headline-recenter)
  org-metaup-hook '(org-babel-load-in-session-maybe)
  org-confirm-elisp-link-function 'yes-or-no-p
  org-clock-out-hook '(org-clock-remove-empty-clock-drawer)
  org-mode-hook '(#[nil "\300\301\302\303\304$\207"
		   [org-add-hook change-major-mode-hook org-show-block-all
		    append local]
		   5]
		 #[nil "\300\301\302\303\304$\207"
		   [org-add-hook change-major-mode-hook
		    org-babel-show-result-all append local]
		   5]
		 org-babel-result-hide-spec org-babel-hide-all-hashes)
  org-metadown-hook '(org-babel-pop-to-session-maybe)
  org-src-mode-hook '(org-src-babel-configure-edit-buffer
		     org-src-mode-configure-edit-buffer)
  org-after-todo-state-change-hook '(org-clock-out-if-current)
  org-confirm-shell-link-function 'yes-or-no-p
  )